diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-07 15:12:03 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-06-07 15:12:03 -0400 |
| commit | 52df25cf2e656146cb3b206d8220124f0417d03f (patch) | |
| tree | a0502334c45d96ad9ab32a855ee5bea28df2191d /include/openssl/objects.h | |
| parent | be606c013d31847718ceb5d97c567988a771c2e5 (diff) | |
| download | openssl-52df25cf2e656146cb3b206d8220124f0417d03f.zip openssl-52df25cf2e656146cb3b206d8220124f0417d03f.tar.gz openssl-52df25cf2e656146cb3b206d8220124f0417d03f.tar.bz2 | |
make error tables const and separate header file
Run perltidy on util/mkerr
Change some mkerr flags, write some doc comments
Make generated tables "const" when genearting lib-internal ones.
Add "state" file for mkerr
Renerate error tables and headers
Rationalize declaration of ERR_load_XXX_strings
Fix out-of-tree build
Add -static; sort flags/vars for options.
Also tweak code output
Moved engines/afalg to engines (from master)
Use -static flag
Standard engine #include's of errors
Don't linewrap err string tables unless necessary
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3392)
Diffstat (limited to 'include/openssl/objects.h')
| -rw-r--r-- | include/openssl/objects.h | 22 |
1 files changed, 1 insertions, 21 deletions
diff --git a/include/openssl/objects.h b/include/openssl/objects.h index 265d8e5..54b42ee 100644 --- a/include/openssl/objects.h +++ b/include/openssl/objects.h @@ -13,6 +13,7 @@ # include <openssl/obj_mac.h> # include <openssl/bio.h> # include <openssl/asn1.h> +# include <openssl/objectserr.h> # define OBJ_NAME_TYPE_UNDEF 0x00 # define OBJ_NAME_TYPE_MD_METH 0x01 @@ -167,29 +168,8 @@ int OBJ_find_sigid_by_algs(int *psignid, int dig_nid, int pkey_nid); int OBJ_add_sigid(int signid, int dig_id, int pkey_id); void OBJ_sigid_free(void); -/* BEGIN ERROR CODES */ -/* - * The following lines are auto generated by the script mkerr.pl. Any changes - * made after this point may be overwritten when the script is next run. - */ - int ERR_load_OBJ_strings(void); -/* Error codes for the OBJ functions. */ - -/* Function codes. */ -# define OBJ_F_OBJ_ADD_OBJECT 105 -# define OBJ_F_OBJ_CREATE 100 -# define OBJ_F_OBJ_DUP 101 -# define OBJ_F_OBJ_NAME_NEW_INDEX 106 -# define OBJ_F_OBJ_NID2LN 102 -# define OBJ_F_OBJ_NID2OBJ 103 -# define OBJ_F_OBJ_NID2SN 104 - -/* Reason codes. */ -# define OBJ_R_OID_EXISTS 102 -# define OBJ_R_UNKNOWN_NID 101 - # ifdef __cplusplus } # endif |