diff options
Diffstat (limited to 'src/lib/libcrypto/x509/x509_err.c')
| -rw-r--r-- | src/lib/libcrypto/x509/x509_err.c | 138 |
1 files changed, 71 insertions, 67 deletions
diff --git a/src/lib/libcrypto/x509/x509_err.c b/src/lib/libcrypto/x509/x509_err.c index 5bbf4acf76..d44d046027 100644 --- a/src/lib/libcrypto/x509/x509_err.c +++ b/src/lib/libcrypto/x509/x509_err.c | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* crypto/x509/x509_err.c */ | 1 | /* crypto/x509/x509_err.c */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| 5 | * Redistribution and use in source and binary forms, with or without | 5 | * Redistribution and use in source and binary forms, with or without |
| 6 | * modification, are permitted provided that the following conditions | 6 | * modification, are permitted provided that the following conditions |
| @@ -64,77 +64,81 @@ | |||
| 64 | 64 | ||
| 65 | /* BEGIN ERROR CODES */ | 65 | /* BEGIN ERROR CODES */ |
| 66 | #ifndef OPENSSL_NO_ERR | 66 | #ifndef OPENSSL_NO_ERR |
| 67 | |||
| 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_X509,func,0) | ||
| 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_X509,0,reason) | ||
| 70 | |||
| 67 | static ERR_STRING_DATA X509_str_functs[]= | 71 | static ERR_STRING_DATA X509_str_functs[]= |
| 68 | { | 72 | { |
| 69 | {ERR_PACK(0,X509_F_ADD_CERT_DIR,0), "ADD_CERT_DIR"}, | 73 | {ERR_FUNC(X509_F_ADD_CERT_DIR), "ADD_CERT_DIR"}, |
| 70 | {ERR_PACK(0,X509_F_BY_FILE_CTRL,0), "BY_FILE_CTRL"}, | 74 | {ERR_FUNC(X509_F_BY_FILE_CTRL), "BY_FILE_CTRL"}, |
| 71 | {ERR_PACK(0,X509_F_DIR_CTRL,0), "DIR_CTRL"}, | 75 | {ERR_FUNC(X509_F_DIR_CTRL), "DIR_CTRL"}, |
| 72 | {ERR_PACK(0,X509_F_GET_CERT_BY_SUBJECT,0), "GET_CERT_BY_SUBJECT"}, | 76 | {ERR_FUNC(X509_F_GET_CERT_BY_SUBJECT), "GET_CERT_BY_SUBJECT"}, |
| 73 | {ERR_PACK(0,X509_F_NETSCAPE_SPKI_B64_DECODE,0), "NETSCAPE_SPKI_b64_decode"}, | 77 | {ERR_FUNC(X509_F_NETSCAPE_SPKI_B64_DECODE), "NETSCAPE_SPKI_b64_decode"}, |
| 74 | {ERR_PACK(0,X509_F_NETSCAPE_SPKI_B64_ENCODE,0), "NETSCAPE_SPKI_b64_encode"}, | 78 | {ERR_FUNC(X509_F_NETSCAPE_SPKI_B64_ENCODE), "NETSCAPE_SPKI_b64_encode"}, |
| 75 | {ERR_PACK(0,X509_F_X509V3_ADD_EXT,0), "X509v3_add_ext"}, | 79 | {ERR_FUNC(X509_F_X509V3_ADD_EXT), "X509v3_add_ext"}, |
| 76 | {ERR_PACK(0,X509_F_X509_ADD_ATTR,0), "X509_ADD_ATTR"}, | 80 | {ERR_FUNC(X509_F_X509_ADD_ATTR), "X509_ADD_ATTR"}, |
| 77 | {ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_NID,0), "X509_ATTRIBUTE_create_by_NID"}, | 81 | {ERR_FUNC(X509_F_X509_ATTRIBUTE_CREATE_BY_NID), "X509_ATTRIBUTE_create_by_NID"}, |
| 78 | {ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ,0), "X509_ATTRIBUTE_create_by_OBJ"}, | 82 | {ERR_FUNC(X509_F_X509_ATTRIBUTE_CREATE_BY_OBJ), "X509_ATTRIBUTE_create_by_OBJ"}, |
| 79 | {ERR_PACK(0,X509_F_X509_ATTRIBUTE_CREATE_BY_TXT,0), "X509_ATTRIBUTE_create_by_txt"}, | 83 | {ERR_FUNC(X509_F_X509_ATTRIBUTE_CREATE_BY_TXT), "X509_ATTRIBUTE_create_by_txt"}, |
| 80 | {ERR_PACK(0,X509_F_X509_ATTRIBUTE_GET0_DATA,0), "X509_ATTRIBUTE_get0_data"}, | 84 | {ERR_FUNC(X509_F_X509_ATTRIBUTE_GET0_DATA), "X509_ATTRIBUTE_get0_data"}, |
| 81 | {ERR_PACK(0,X509_F_X509_ATTRIBUTE_SET1_DATA,0), "X509_ATTRIBUTE_set1_data"}, | 85 | {ERR_FUNC(X509_F_X509_ATTRIBUTE_SET1_DATA), "X509_ATTRIBUTE_set1_data"}, |
| 82 | {ERR_PACK(0,X509_F_X509_CHECK_PRIVATE_KEY,0), "X509_check_private_key"}, | 86 | {ERR_FUNC(X509_F_X509_CHECK_PRIVATE_KEY), "X509_check_private_key"}, |
| 83 | {ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_NID,0), "X509_EXTENSION_create_by_NID"}, | 87 | {ERR_FUNC(X509_F_X509_EXTENSION_CREATE_BY_NID), "X509_EXTENSION_create_by_NID"}, |
| 84 | {ERR_PACK(0,X509_F_X509_EXTENSION_CREATE_BY_OBJ,0), "X509_EXTENSION_create_by_OBJ"}, | 88 | {ERR_FUNC(X509_F_X509_EXTENSION_CREATE_BY_OBJ), "X509_EXTENSION_create_by_OBJ"}, |
| 85 | {ERR_PACK(0,X509_F_X509_GET_PUBKEY_PARAMETERS,0), "X509_get_pubkey_parameters"}, | 89 | {ERR_FUNC(X509_F_X509_GET_PUBKEY_PARAMETERS), "X509_get_pubkey_parameters"}, |
| 86 | {ERR_PACK(0,X509_F_X509_LOAD_CERT_CRL_FILE,0), "X509_load_cert_crl_file"}, | 90 | {ERR_FUNC(X509_F_X509_LOAD_CERT_CRL_FILE), "X509_load_cert_crl_file"}, |
| 87 | {ERR_PACK(0,X509_F_X509_LOAD_CERT_FILE,0), "X509_load_cert_file"}, | 91 | {ERR_FUNC(X509_F_X509_LOAD_CERT_FILE), "X509_load_cert_file"}, |
| 88 | {ERR_PACK(0,X509_F_X509_LOAD_CRL_FILE,0), "X509_load_crl_file"}, | 92 | {ERR_FUNC(X509_F_X509_LOAD_CRL_FILE), "X509_load_crl_file"}, |
| 89 | {ERR_PACK(0,X509_F_X509_NAME_ADD_ENTRY,0), "X509_NAME_add_entry"}, | 93 | {ERR_FUNC(X509_F_X509_NAME_ADD_ENTRY), "X509_NAME_add_entry"}, |
| 90 | {ERR_PACK(0,X509_F_X509_NAME_ENTRY_CREATE_BY_NID,0), "X509_NAME_ENTRY_create_by_NID"}, | 94 | {ERR_FUNC(X509_F_X509_NAME_ENTRY_CREATE_BY_NID), "X509_NAME_ENTRY_create_by_NID"}, |
| 91 | {ERR_PACK(0,X509_F_X509_NAME_ENTRY_CREATE_BY_TXT,0), "X509_NAME_ENTRY_create_by_txt"}, | 95 | {ERR_FUNC(X509_F_X509_NAME_ENTRY_CREATE_BY_TXT), "X509_NAME_ENTRY_create_by_txt"}, |
| 92 | {ERR_PACK(0,X509_F_X509_NAME_ENTRY_SET_OBJECT,0), "X509_NAME_ENTRY_set_object"}, | 96 | {ERR_FUNC(X509_F_X509_NAME_ENTRY_SET_OBJECT), "X509_NAME_ENTRY_set_object"}, |
| 93 | {ERR_PACK(0,X509_F_X509_NAME_ONELINE,0), "X509_NAME_oneline"}, | 97 | {ERR_FUNC(X509_F_X509_NAME_ONELINE), "X509_NAME_oneline"}, |
| 94 | {ERR_PACK(0,X509_F_X509_NAME_PRINT,0), "X509_NAME_print"}, | 98 | {ERR_FUNC(X509_F_X509_NAME_PRINT), "X509_NAME_print"}, |
| 95 | {ERR_PACK(0,X509_F_X509_PRINT_FP,0), "X509_print_fp"}, | 99 | {ERR_FUNC(X509_F_X509_PRINT_FP), "X509_print_fp"}, |
| 96 | {ERR_PACK(0,X509_F_X509_PUBKEY_GET,0), "X509_PUBKEY_get"}, | 100 | {ERR_FUNC(X509_F_X509_PUBKEY_GET), "X509_PUBKEY_get"}, |
| 97 | {ERR_PACK(0,X509_F_X509_PUBKEY_SET,0), "X509_PUBKEY_set"}, | 101 | {ERR_FUNC(X509_F_X509_PUBKEY_SET), "X509_PUBKEY_set"}, |
| 98 | {ERR_PACK(0,X509_F_X509_REQ_PRINT,0), "X509_REQ_print"}, | 102 | {ERR_FUNC(X509_F_X509_REQ_PRINT), "X509_REQ_print"}, |
| 99 | {ERR_PACK(0,X509_F_X509_REQ_PRINT_FP,0), "X509_REQ_print_fp"}, | 103 | {ERR_FUNC(X509_F_X509_REQ_PRINT_FP), "X509_REQ_print_fp"}, |
| 100 | {ERR_PACK(0,X509_F_X509_REQ_TO_X509,0), "X509_REQ_to_X509"}, | 104 | {ERR_FUNC(X509_F_X509_REQ_TO_X509), "X509_REQ_to_X509"}, |
| 101 | {ERR_PACK(0,X509_F_X509_STORE_ADD_CERT,0), "X509_STORE_add_cert"}, | 105 | {ERR_FUNC(X509_F_X509_STORE_ADD_CERT), "X509_STORE_add_cert"}, |
| 102 | {ERR_PACK(0,X509_F_X509_STORE_ADD_CRL,0), "X509_STORE_add_crl"}, | 106 | {ERR_FUNC(X509_F_X509_STORE_ADD_CRL), "X509_STORE_add_crl"}, |
| 103 | {ERR_PACK(0,X509_F_X509_STORE_CTX_INIT,0), "X509_STORE_CTX_init"}, | 107 | {ERR_FUNC(X509_F_X509_STORE_CTX_INIT), "X509_STORE_CTX_init"}, |
| 104 | {ERR_PACK(0,X509_F_X509_STORE_CTX_NEW,0), "X509_STORE_CTX_new"}, | 108 | {ERR_FUNC(X509_F_X509_STORE_CTX_NEW), "X509_STORE_CTX_new"}, |
| 105 | {ERR_PACK(0,X509_F_X509_STORE_CTX_PURPOSE_INHERIT,0), "X509_STORE_CTX_purpose_inherit"}, | 109 | {ERR_FUNC(X509_F_X509_STORE_CTX_PURPOSE_INHERIT), "X509_STORE_CTX_purpose_inherit"}, |
| 106 | {ERR_PACK(0,X509_F_X509_TO_X509_REQ,0), "X509_to_X509_REQ"}, | 110 | {ERR_FUNC(X509_F_X509_TO_X509_REQ), "X509_to_X509_REQ"}, |
| 107 | {ERR_PACK(0,X509_F_X509_TRUST_ADD,0), "X509_TRUST_add"}, | 111 | {ERR_FUNC(X509_F_X509_TRUST_ADD), "X509_TRUST_add"}, |
| 108 | {ERR_PACK(0,X509_F_X509_TRUST_SET,0), "X509_TRUST_set"}, | 112 | {ERR_FUNC(X509_F_X509_TRUST_SET), "X509_TRUST_set"}, |
| 109 | {ERR_PACK(0,X509_F_X509_VERIFY_CERT,0), "X509_verify_cert"}, | 113 | {ERR_FUNC(X509_F_X509_VERIFY_CERT), "X509_verify_cert"}, |
| 110 | {0,NULL} | 114 | {0,NULL} |
| 111 | }; | 115 | }; |
| 112 | 116 | ||
| 113 | static ERR_STRING_DATA X509_str_reasons[]= | 117 | static ERR_STRING_DATA X509_str_reasons[]= |
| 114 | { | 118 | { |
| 115 | {X509_R_BAD_X509_FILETYPE ,"bad x509 filetype"}, | 119 | {ERR_REASON(X509_R_BAD_X509_FILETYPE) ,"bad x509 filetype"}, |
| 116 | {X509_R_BASE64_DECODE_ERROR ,"base64 decode error"}, | 120 | {ERR_REASON(X509_R_BASE64_DECODE_ERROR) ,"base64 decode error"}, |
| 117 | {X509_R_CANT_CHECK_DH_KEY ,"cant check dh key"}, | 121 | {ERR_REASON(X509_R_CANT_CHECK_DH_KEY) ,"cant check dh key"}, |
| 118 | {X509_R_CERT_ALREADY_IN_HASH_TABLE ,"cert already in hash table"}, | 122 | {ERR_REASON(X509_R_CERT_ALREADY_IN_HASH_TABLE),"cert already in hash table"}, |
| 119 | {X509_R_ERR_ASN1_LIB ,"err asn1 lib"}, | 123 | {ERR_REASON(X509_R_ERR_ASN1_LIB) ,"err asn1 lib"}, |
| 120 | {X509_R_INVALID_DIRECTORY ,"invalid directory"}, | 124 | {ERR_REASON(X509_R_INVALID_DIRECTORY) ,"invalid directory"}, |
| 121 | {X509_R_INVALID_FIELD_NAME ,"invalid field name"}, | 125 | {ERR_REASON(X509_R_INVALID_FIELD_NAME) ,"invalid field name"}, |
| 122 | {X509_R_INVALID_TRUST ,"invalid trust"}, | 126 | {ERR_REASON(X509_R_INVALID_TRUST) ,"invalid trust"}, |
| 123 | {X509_R_KEY_TYPE_MISMATCH ,"key type mismatch"}, | 127 | {ERR_REASON(X509_R_KEY_TYPE_MISMATCH) ,"key type mismatch"}, |
| 124 | {X509_R_KEY_VALUES_MISMATCH ,"key values mismatch"}, | 128 | {ERR_REASON(X509_R_KEY_VALUES_MISMATCH) ,"key values mismatch"}, |
| 125 | {X509_R_LOADING_CERT_DIR ,"loading cert dir"}, | 129 | {ERR_REASON(X509_R_LOADING_CERT_DIR) ,"loading cert dir"}, |
| 126 | {X509_R_LOADING_DEFAULTS ,"loading defaults"}, | 130 | {ERR_REASON(X509_R_LOADING_DEFAULTS) ,"loading defaults"}, |
| 127 | {X509_R_NO_CERT_SET_FOR_US_TO_VERIFY ,"no cert set for us to verify"}, | 131 | {ERR_REASON(X509_R_NO_CERT_SET_FOR_US_TO_VERIFY),"no cert set for us to verify"}, |
| 128 | {X509_R_SHOULD_RETRY ,"should retry"}, | 132 | {ERR_REASON(X509_R_SHOULD_RETRY) ,"should retry"}, |
| 129 | {X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN,"unable to find parameters in chain"}, | 133 | {ERR_REASON(X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN),"unable to find parameters in chain"}, |
| 130 | {X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY ,"unable to get certs public key"}, | 134 | {ERR_REASON(X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY),"unable to get certs public key"}, |
| 131 | {X509_R_UNKNOWN_KEY_TYPE ,"unknown key type"}, | 135 | {ERR_REASON(X509_R_UNKNOWN_KEY_TYPE) ,"unknown key type"}, |
| 132 | {X509_R_UNKNOWN_NID ,"unknown nid"}, | 136 | {ERR_REASON(X509_R_UNKNOWN_NID) ,"unknown nid"}, |
| 133 | {X509_R_UNKNOWN_PURPOSE_ID ,"unknown purpose id"}, | 137 | {ERR_REASON(X509_R_UNKNOWN_PURPOSE_ID) ,"unknown purpose id"}, |
| 134 | {X509_R_UNKNOWN_TRUST_ID ,"unknown trust id"}, | 138 | {ERR_REASON(X509_R_UNKNOWN_TRUST_ID) ,"unknown trust id"}, |
| 135 | {X509_R_UNSUPPORTED_ALGORITHM ,"unsupported algorithm"}, | 139 | {ERR_REASON(X509_R_UNSUPPORTED_ALGORITHM),"unsupported algorithm"}, |
| 136 | {X509_R_WRONG_LOOKUP_TYPE ,"wrong lookup type"}, | 140 | {ERR_REASON(X509_R_WRONG_LOOKUP_TYPE) ,"wrong lookup type"}, |
| 137 | {X509_R_WRONG_TYPE ,"wrong type"}, | 141 | {ERR_REASON(X509_R_WRONG_TYPE) ,"wrong type"}, |
| 138 | {0,NULL} | 142 | {0,NULL} |
| 139 | }; | 143 | }; |
| 140 | 144 | ||
| @@ -148,8 +152,8 @@ void ERR_load_X509_strings(void) | |||
| 148 | { | 152 | { |
| 149 | init=0; | 153 | init=0; |
| 150 | #ifndef OPENSSL_NO_ERR | 154 | #ifndef OPENSSL_NO_ERR |
| 151 | ERR_load_strings(ERR_LIB_X509,X509_str_functs); | 155 | ERR_load_strings(0,X509_str_functs); |
| 152 | ERR_load_strings(ERR_LIB_X509,X509_str_reasons); | 156 | ERR_load_strings(0,X509_str_reasons); |
| 153 | #endif | 157 | #endif |
| 154 | 158 | ||
| 155 | } | 159 | } |
