0c994d54af
Currently, there are two different directories which contain internal header files of libcrypto which are meant to be shared internally: While header files in 'include/internal' are intended to be shared between libcrypto and libssl, the files in 'crypto/include/internal' are intended to be shared inside libcrypto only. To make things complicated, the include search path is set up in such a way that the directive #include "internal/file.h" could refer to a file in either of these two directoroes. This makes it necessary in some cases to add a '_int.h' suffix to some files to resolve this ambiguity: #include "internal/file.h" # located in 'include/internal' #include "internal/file_int.h" # located in 'crypto/include/internal' This commit moves the private crypto headers from 'crypto/include/internal' to 'include/crypto' As a result, the include directives become unambiguous #include "internal/file.h" # located in 'include/internal' #include "crypto/file.h" # located in 'include/crypto' hence the superfluous '_int.h' suffixes can be stripped. The files 'store_int.h' and 'store.h' need to be treated specially; they are joined into a single file. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9681) |
||
---|---|---|
.. | ||
build.info | ||
o_names.c | ||
obj_dat.c | ||
obj_dat.h | ||
obj_dat.pl | ||
obj_err.c | ||
obj_lcl.h | ||
obj_lib.c | ||
obj_mac.num | ||
obj_xref.c | ||
obj_xref.h | ||
obj_xref.txt | ||
objects.pl | ||
objects.txt | ||
objxref.pl | ||
README |
objects.txt syntax ------------------ To cover all the naming hacks that were previously in objects.h needed some kind of hacks in objects.txt. The basic syntax for adding an object is as follows: 1 2 3 4 : shortName : Long Name If Long Name contains only word characters and hyphen-minus (0x2D) or full stop (0x2E) then Long Name is used as basis for the base name in C. Otherwise, the shortName is used. The base name (let's call it 'base') will then be used to create the C macros SN_base, LN_base, NID_base and OBJ_base. Note that if the base name contains spaces, dashes or periods, those will be converted to underscore. Then there are some extra commands: !Alias foo 1 2 3 4 This just makes a name foo for an OID. The C macro OBJ_foo will be created as a result. !Cname foo This makes sure that the name foo will be used as base name in C. !module foo 1 2 3 4 : shortName : Long Name !global The !module command was meant to define a kind of modularity. What it does is to make sure the module name is prepended to the base name. !global turns this off. This construction is not recursive. Lines starting with # are treated as comments, as well as any line starting with ! and not matching the commands above.