diff options
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libcrypto/pkcs12/pk12err.c | 137 |
1 files changed, 67 insertions, 70 deletions
diff --git a/src/lib/libcrypto/pkcs12/pk12err.c b/src/lib/libcrypto/pkcs12/pk12err.c index 5f54a7d062..12f418eb23 100644 --- a/src/lib/libcrypto/pkcs12/pk12err.c +++ b/src/lib/libcrypto/pkcs12/pk12err.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: pk12err.c,v 1.8 2014/06/12 15:49:30 deraadt Exp $ */ | 1 | /* $OpenBSD: pk12err.c,v 1.9 2014/07/08 09:24:53 jsing Exp $ */ |
| 2 | /* ==================================================================== | 2 | /* ==================================================================== |
| 3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999-2006 The OpenSSL Project. All rights reserved. |
| 4 | * | 4 | * |
| @@ -7,7 +7,7 @@ | |||
| 7 | * are met: | 7 | * are met: |
| 8 | * | 8 | * |
| 9 | * 1. Redistributions of source code must retain the above copyright | 9 | * 1. Redistributions of source code must retain the above copyright |
| 10 | * notice, this list of conditions and the following disclaimer. | 10 | * notice, this list of conditions and the following disclaimer. |
| 11 | * | 11 | * |
| 12 | * 2. Redistributions in binary form must reproduce the above copyright | 12 | * 2. Redistributions in binary form must reproduce the above copyright |
| 13 | * notice, this list of conditions and the following disclaimer in | 13 | * notice, this list of conditions and the following disclaimer in |
| @@ -68,77 +68,74 @@ | |||
| 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_PKCS12,func,0) | 68 | #define ERR_FUNC(func) ERR_PACK(ERR_LIB_PKCS12,func,0) |
| 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PKCS12,0,reason) | 69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PKCS12,0,reason) |
| 70 | 70 | ||
| 71 | static ERR_STRING_DATA PKCS12_str_functs[]= | 71 | static ERR_STRING_DATA PKCS12_str_functs[]= { |
| 72 | { | 72 | {ERR_FUNC(PKCS12_F_PARSE_BAG), "PARSE_BAG"}, |
| 73 | {ERR_FUNC(PKCS12_F_PARSE_BAG), "PARSE_BAG"}, | 73 | {ERR_FUNC(PKCS12_F_PARSE_BAGS), "PARSE_BAGS"}, |
| 74 | {ERR_FUNC(PKCS12_F_PARSE_BAGS), "PARSE_BAGS"}, | 74 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_FRIENDLYNAME), "PKCS12_ADD_FRIENDLYNAME"}, |
| 75 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_FRIENDLYNAME), "PKCS12_ADD_FRIENDLYNAME"}, | 75 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC), "PKCS12_add_friendlyname_asc"}, |
| 76 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_ASC), "PKCS12_add_friendlyname_asc"}, | 76 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI), "PKCS12_add_friendlyname_uni"}, |
| 77 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_FRIENDLYNAME_UNI), "PKCS12_add_friendlyname_uni"}, | 77 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_LOCALKEYID), "PKCS12_add_localkeyid"}, |
| 78 | {ERR_FUNC(PKCS12_F_PKCS12_ADD_LOCALKEYID), "PKCS12_add_localkeyid"}, | 78 | {ERR_FUNC(PKCS12_F_PKCS12_CREATE), "PKCS12_create"}, |
| 79 | {ERR_FUNC(PKCS12_F_PKCS12_CREATE), "PKCS12_create"}, | 79 | {ERR_FUNC(PKCS12_F_PKCS12_GEN_MAC), "PKCS12_gen_mac"}, |
| 80 | {ERR_FUNC(PKCS12_F_PKCS12_GEN_MAC), "PKCS12_gen_mac"}, | 80 | {ERR_FUNC(PKCS12_F_PKCS12_INIT), "PKCS12_init"}, |
| 81 | {ERR_FUNC(PKCS12_F_PKCS12_INIT), "PKCS12_init"}, | 81 | {ERR_FUNC(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I), "PKCS12_item_decrypt_d2i"}, |
| 82 | {ERR_FUNC(PKCS12_F_PKCS12_ITEM_DECRYPT_D2I), "PKCS12_item_decrypt_d2i"}, | 82 | {ERR_FUNC(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT), "PKCS12_item_i2d_encrypt"}, |
| 83 | {ERR_FUNC(PKCS12_F_PKCS12_ITEM_I2D_ENCRYPT), "PKCS12_item_i2d_encrypt"}, | 83 | {ERR_FUNC(PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG), "PKCS12_item_pack_safebag"}, |
| 84 | {ERR_FUNC(PKCS12_F_PKCS12_ITEM_PACK_SAFEBAG), "PKCS12_item_pack_safebag"}, | 84 | {ERR_FUNC(PKCS12_F_PKCS12_KEY_GEN_ASC), "PKCS12_key_gen_asc"}, |
| 85 | {ERR_FUNC(PKCS12_F_PKCS12_KEY_GEN_ASC), "PKCS12_key_gen_asc"}, | 85 | {ERR_FUNC(PKCS12_F_PKCS12_KEY_GEN_UNI), "PKCS12_key_gen_uni"}, |
| 86 | {ERR_FUNC(PKCS12_F_PKCS12_KEY_GEN_UNI), "PKCS12_key_gen_uni"}, | 86 | {ERR_FUNC(PKCS12_F_PKCS12_MAKE_KEYBAG), "PKCS12_MAKE_KEYBAG"}, |
| 87 | {ERR_FUNC(PKCS12_F_PKCS12_MAKE_KEYBAG), "PKCS12_MAKE_KEYBAG"}, | 87 | {ERR_FUNC(PKCS12_F_PKCS12_MAKE_SHKEYBAG), "PKCS12_MAKE_SHKEYBAG"}, |
| 88 | {ERR_FUNC(PKCS12_F_PKCS12_MAKE_SHKEYBAG), "PKCS12_MAKE_SHKEYBAG"}, | 88 | {ERR_FUNC(PKCS12_F_PKCS12_NEWPASS), "PKCS12_newpass"}, |
| 89 | {ERR_FUNC(PKCS12_F_PKCS12_NEWPASS), "PKCS12_newpass"}, | 89 | {ERR_FUNC(PKCS12_F_PKCS12_PACK_P7DATA), "PKCS12_pack_p7data"}, |
| 90 | {ERR_FUNC(PKCS12_F_PKCS12_PACK_P7DATA), "PKCS12_pack_p7data"}, | 90 | {ERR_FUNC(PKCS12_F_PKCS12_PACK_P7ENCDATA), "PKCS12_pack_p7encdata"}, |
| 91 | {ERR_FUNC(PKCS12_F_PKCS12_PACK_P7ENCDATA), "PKCS12_pack_p7encdata"}, | 91 | {ERR_FUNC(PKCS12_F_PKCS12_PARSE), "PKCS12_parse"}, |
| 92 | {ERR_FUNC(PKCS12_F_PKCS12_PARSE), "PKCS12_parse"}, | 92 | {ERR_FUNC(PKCS12_F_PKCS12_PBE_CRYPT), "PKCS12_pbe_crypt"}, |
| 93 | {ERR_FUNC(PKCS12_F_PKCS12_PBE_CRYPT), "PKCS12_pbe_crypt"}, | 93 | {ERR_FUNC(PKCS12_F_PKCS12_PBE_KEYIVGEN), "PKCS12_PBE_keyivgen"}, |
| 94 | {ERR_FUNC(PKCS12_F_PKCS12_PBE_KEYIVGEN), "PKCS12_PBE_keyivgen"}, | 94 | {ERR_FUNC(PKCS12_F_PKCS12_SETUP_MAC), "PKCS12_setup_mac"}, |
| 95 | {ERR_FUNC(PKCS12_F_PKCS12_SETUP_MAC), "PKCS12_setup_mac"}, | 95 | {ERR_FUNC(PKCS12_F_PKCS12_SET_MAC), "PKCS12_set_mac"}, |
| 96 | {ERR_FUNC(PKCS12_F_PKCS12_SET_MAC), "PKCS12_set_mac"}, | 96 | {ERR_FUNC(PKCS12_F_PKCS12_UNPACK_AUTHSAFES), "PKCS12_unpack_authsafes"}, |
| 97 | {ERR_FUNC(PKCS12_F_PKCS12_UNPACK_AUTHSAFES), "PKCS12_unpack_authsafes"}, | 97 | {ERR_FUNC(PKCS12_F_PKCS12_UNPACK_P7DATA), "PKCS12_unpack_p7data"}, |
| 98 | {ERR_FUNC(PKCS12_F_PKCS12_UNPACK_P7DATA), "PKCS12_unpack_p7data"}, | 98 | {ERR_FUNC(PKCS12_F_PKCS12_VERIFY_MAC), "PKCS12_verify_mac"}, |
| 99 | {ERR_FUNC(PKCS12_F_PKCS12_VERIFY_MAC), "PKCS12_verify_mac"}, | 99 | {ERR_FUNC(PKCS12_F_PKCS8_ADD_KEYUSAGE), "PKCS8_add_keyusage"}, |
| 100 | {ERR_FUNC(PKCS12_F_PKCS8_ADD_KEYUSAGE), "PKCS8_add_keyusage"}, | 100 | {ERR_FUNC(PKCS12_F_PKCS8_ENCRYPT), "PKCS8_encrypt"}, |
| 101 | {ERR_FUNC(PKCS12_F_PKCS8_ENCRYPT), "PKCS8_encrypt"}, | 101 | {0, NULL} |
| 102 | {0,NULL} | 102 | }; |
| 103 | }; | ||
| 104 | 103 | ||
| 105 | static ERR_STRING_DATA PKCS12_str_reasons[]= | 104 | static ERR_STRING_DATA PKCS12_str_reasons[]= { |
| 106 | { | 105 | {ERR_REASON(PKCS12_R_CANT_PACK_STRUCTURE), "cant pack structure"}, |
| 107 | {ERR_REASON(PKCS12_R_CANT_PACK_STRUCTURE),"cant pack structure"}, | 106 | {ERR_REASON(PKCS12_R_CONTENT_TYPE_NOT_DATA), "content type not data"}, |
| 108 | {ERR_REASON(PKCS12_R_CONTENT_TYPE_NOT_DATA),"content type not data"}, | 107 | {ERR_REASON(PKCS12_R_DECODE_ERROR) , "decode error"}, |
| 109 | {ERR_REASON(PKCS12_R_DECODE_ERROR) ,"decode error"}, | 108 | {ERR_REASON(PKCS12_R_ENCODE_ERROR) , "encode error"}, |
| 110 | {ERR_REASON(PKCS12_R_ENCODE_ERROR) ,"encode error"}, | 109 | {ERR_REASON(PKCS12_R_ENCRYPT_ERROR) , "encrypt error"}, |
| 111 | {ERR_REASON(PKCS12_R_ENCRYPT_ERROR) ,"encrypt error"}, | 110 | {ERR_REASON(PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE), "error setting encrypted data type"}, |
| 112 | {ERR_REASON(PKCS12_R_ERROR_SETTING_ENCRYPTED_DATA_TYPE),"error setting encrypted data type"}, | 111 | {ERR_REASON(PKCS12_R_INVALID_NULL_ARGUMENT), "invalid null argument"}, |
| 113 | {ERR_REASON(PKCS12_R_INVALID_NULL_ARGUMENT),"invalid null argument"}, | 112 | {ERR_REASON(PKCS12_R_INVALID_NULL_PKCS12_POINTER), "invalid null pkcs12 pointer"}, |
| 114 | {ERR_REASON(PKCS12_R_INVALID_NULL_PKCS12_POINTER),"invalid null pkcs12 pointer"}, | 113 | {ERR_REASON(PKCS12_R_IV_GEN_ERROR) , "iv gen error"}, |
| 115 | {ERR_REASON(PKCS12_R_IV_GEN_ERROR) ,"iv gen error"}, | 114 | {ERR_REASON(PKCS12_R_KEY_GEN_ERROR) , "key gen error"}, |
| 116 | {ERR_REASON(PKCS12_R_KEY_GEN_ERROR) ,"key gen error"}, | 115 | {ERR_REASON(PKCS12_R_MAC_ABSENT) , "mac absent"}, |
| 117 | {ERR_REASON(PKCS12_R_MAC_ABSENT) ,"mac absent"}, | 116 | {ERR_REASON(PKCS12_R_MAC_GENERATION_ERROR), "mac generation error"}, |
| 118 | {ERR_REASON(PKCS12_R_MAC_GENERATION_ERROR),"mac generation error"}, | 117 | {ERR_REASON(PKCS12_R_MAC_SETUP_ERROR) , "mac setup error"}, |
| 119 | {ERR_REASON(PKCS12_R_MAC_SETUP_ERROR) ,"mac setup error"}, | 118 | {ERR_REASON(PKCS12_R_MAC_STRING_SET_ERROR), "mac string set error"}, |
| 120 | {ERR_REASON(PKCS12_R_MAC_STRING_SET_ERROR),"mac string set error"}, | 119 | {ERR_REASON(PKCS12_R_MAC_VERIFY_ERROR) , "mac verify error"}, |
| 121 | {ERR_REASON(PKCS12_R_MAC_VERIFY_ERROR) ,"mac verify error"}, | 120 | {ERR_REASON(PKCS12_R_MAC_VERIFY_FAILURE) , "mac verify failure"}, |
| 122 | {ERR_REASON(PKCS12_R_MAC_VERIFY_FAILURE) ,"mac verify failure"}, | 121 | {ERR_REASON(PKCS12_R_PARSE_ERROR) , "parse error"}, |
| 123 | {ERR_REASON(PKCS12_R_PARSE_ERROR) ,"parse error"}, | 122 | {ERR_REASON(PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR), "pkcs12 algor cipherinit error"}, |
| 124 | {ERR_REASON(PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR),"pkcs12 algor cipherinit error"}, | 123 | {ERR_REASON(PKCS12_R_PKCS12_CIPHERFINAL_ERROR), "pkcs12 cipherfinal error"}, |
| 125 | {ERR_REASON(PKCS12_R_PKCS12_CIPHERFINAL_ERROR),"pkcs12 cipherfinal error"}, | 124 | {ERR_REASON(PKCS12_R_PKCS12_PBE_CRYPT_ERROR), "pkcs12 pbe crypt error"}, |
| 126 | {ERR_REASON(PKCS12_R_PKCS12_PBE_CRYPT_ERROR),"pkcs12 pbe crypt error"}, | 125 | {ERR_REASON(PKCS12_R_UNKNOWN_DIGEST_ALGORITHM), "unknown digest algorithm"}, |
| 127 | {ERR_REASON(PKCS12_R_UNKNOWN_DIGEST_ALGORITHM),"unknown digest algorithm"}, | 126 | {ERR_REASON(PKCS12_R_UNSUPPORTED_PKCS12_MODE), "unsupported pkcs12 mode"}, |
| 128 | {ERR_REASON(PKCS12_R_UNSUPPORTED_PKCS12_MODE),"unsupported pkcs12 mode"}, | 127 | {0, NULL} |
| 129 | {0,NULL} | 128 | }; |
| 130 | }; | ||
| 131 | 129 | ||
| 132 | #endif | 130 | #endif |
| 133 | 131 | ||
| 134 | void ERR_load_PKCS12_strings(void) | 132 | void |
| 135 | { | 133 | ERR_load_PKCS12_strings(void) |
| 134 | { | ||
| 136 | #ifndef OPENSSL_NO_ERR | 135 | #ifndef OPENSSL_NO_ERR |
| 137 | 136 | if (ERR_func_error_string(PKCS12_str_functs[0].error) == NULL) { | |
| 138 | if (ERR_func_error_string(PKCS12_str_functs[0].error) == NULL) | 137 | ERR_load_strings(0, PKCS12_str_functs); |
| 139 | { | 138 | ERR_load_strings(0, PKCS12_str_reasons); |
| 140 | ERR_load_strings(0,PKCS12_str_functs); | ||
| 141 | ERR_load_strings(0,PKCS12_str_reasons); | ||
| 142 | } | ||
| 143 | #endif | ||
| 144 | } | 139 | } |
| 140 | #endif | ||
| 141 | } | ||
