diff options
Diffstat (limited to 'src/lib/libcrypto/pem/pem_err.c')
-rw-r--r-- | src/lib/libcrypto/pem/pem_err.c | 88 |
1 files changed, 42 insertions, 46 deletions
diff --git a/src/lib/libcrypto/pem/pem_err.c b/src/lib/libcrypto/pem/pem_err.c index 8527028ebc..3b39b84d66 100644 --- a/src/lib/libcrypto/pem/pem_err.c +++ b/src/lib/libcrypto/pem/pem_err.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* crypto/pem/pem_err.c */ | 1 | /* crypto/pem/pem_err.c */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. | 3 | * Copyright (c) 1999 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,56 +64,52 @@ | |||
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_PEM,func,0) | ||
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_PEM,0,reason) | ||
70 | |||
71 | static ERR_STRING_DATA PEM_str_functs[]= | 67 | static ERR_STRING_DATA PEM_str_functs[]= |
72 | { | 68 | { |
73 | {ERR_FUNC(PEM_F_D2I_PKCS8PRIVATEKEY_BIO), "d2i_PKCS8PrivateKey_bio"}, | 69 | {ERR_PACK(0,PEM_F_D2I_PKCS8PRIVATEKEY_BIO,0), "d2i_PKCS8PrivateKey_bio"}, |
74 | {ERR_FUNC(PEM_F_D2I_PKCS8PRIVATEKEY_FP), "d2i_PKCS8PrivateKey_fp"}, | 70 | {ERR_PACK(0,PEM_F_D2I_PKCS8PRIVATEKEY_FP,0), "d2i_PKCS8PrivateKey_fp"}, |
75 | {ERR_FUNC(PEM_F_DEF_CALLBACK), "DEF_CALLBACK"}, | 71 | {ERR_PACK(0,PEM_F_DEF_CALLBACK,0), "DEF_CALLBACK"}, |
76 | {ERR_FUNC(PEM_F_LOAD_IV), "LOAD_IV"}, | 72 | {ERR_PACK(0,PEM_F_LOAD_IV,0), "LOAD_IV"}, |
77 | {ERR_FUNC(PEM_F_PEM_ASN1_READ), "PEM_ASN1_read"}, | 73 | {ERR_PACK(0,PEM_F_PEM_ASN1_READ,0), "PEM_ASN1_read"}, |
78 | {ERR_FUNC(PEM_F_PEM_ASN1_READ_BIO), "PEM_ASN1_read_bio"}, | 74 | {ERR_PACK(0,PEM_F_PEM_ASN1_READ_BIO,0), "PEM_ASN1_read_bio"}, |
79 | {ERR_FUNC(PEM_F_PEM_ASN1_WRITE), "PEM_ASN1_write"}, | 75 | {ERR_PACK(0,PEM_F_PEM_ASN1_WRITE,0), "PEM_ASN1_write"}, |
80 | {ERR_FUNC(PEM_F_PEM_ASN1_WRITE_BIO), "PEM_ASN1_write_bio"}, | 76 | {ERR_PACK(0,PEM_F_PEM_ASN1_WRITE_BIO,0), "PEM_ASN1_write_bio"}, |
81 | {ERR_FUNC(PEM_F_PEM_DO_HEADER), "PEM_do_header"}, | 77 | {ERR_PACK(0,PEM_F_PEM_DO_HEADER,0), "PEM_do_header"}, |
82 | {ERR_FUNC(PEM_F_PEM_F_DO_PK8KEY_FP), "PEM_F_DO_PK8KEY_FP"}, | 78 | {ERR_PACK(0,PEM_F_PEM_F_DO_PK8KEY_FP,0), "PEM_F_DO_PK8KEY_FP"}, |
83 | {ERR_FUNC(PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY), "PEM_F_PEM_WRITE_PKCS8PRIVATEKEY"}, | 79 | {ERR_PACK(0,PEM_F_PEM_F_PEM_WRITE_PKCS8PRIVATEKEY,0), "PEM_F_PEM_WRITE_PKCS8PRIVATEKEY"}, |
84 | {ERR_FUNC(PEM_F_PEM_GET_EVP_CIPHER_INFO), "PEM_get_EVP_CIPHER_INFO"}, | 80 | {ERR_PACK(0,PEM_F_PEM_GET_EVP_CIPHER_INFO,0), "PEM_get_EVP_CIPHER_INFO"}, |
85 | {ERR_FUNC(PEM_F_PEM_READ), "PEM_read"}, | 81 | {ERR_PACK(0,PEM_F_PEM_READ,0), "PEM_read"}, |
86 | {ERR_FUNC(PEM_F_PEM_READ_BIO), "PEM_read_bio"}, | 82 | {ERR_PACK(0,PEM_F_PEM_READ_BIO,0), "PEM_read_bio"}, |
87 | {ERR_FUNC(PEM_F_PEM_SEALFINAL), "PEM_SealFinal"}, | 83 | {ERR_PACK(0,PEM_F_PEM_SEALFINAL,0), "PEM_SealFinal"}, |
88 | {ERR_FUNC(PEM_F_PEM_SEALINIT), "PEM_SealInit"}, | 84 | {ERR_PACK(0,PEM_F_PEM_SEALINIT,0), "PEM_SealInit"}, |
89 | {ERR_FUNC(PEM_F_PEM_SIGNFINAL), "PEM_SignFinal"}, | 85 | {ERR_PACK(0,PEM_F_PEM_SIGNFINAL,0), "PEM_SignFinal"}, |
90 | {ERR_FUNC(PEM_F_PEM_WRITE), "PEM_write"}, | 86 | {ERR_PACK(0,PEM_F_PEM_WRITE,0), "PEM_write"}, |
91 | {ERR_FUNC(PEM_F_PEM_WRITE_BIO), "PEM_write_bio"}, | 87 | {ERR_PACK(0,PEM_F_PEM_WRITE_BIO,0), "PEM_write_bio"}, |
92 | {ERR_FUNC(PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY), "PEM_write_bio_PKCS8PrivateKey"}, | 88 | {ERR_PACK(0,PEM_F_PEM_WRITE_BIO_PKCS8PRIVATEKEY,0), "PEM_write_bio_PKCS8PrivateKey"}, |
93 | {ERR_FUNC(PEM_F_PEM_X509_INFO_READ), "PEM_X509_INFO_read"}, | 89 | {ERR_PACK(0,PEM_F_PEM_X509_INFO_READ,0), "PEM_X509_INFO_read"}, |
94 | {ERR_FUNC(PEM_F_PEM_X509_INFO_READ_BIO), "PEM_X509_INFO_read_bio"}, | 90 | {ERR_PACK(0,PEM_F_PEM_X509_INFO_READ_BIO,0), "PEM_X509_INFO_read_bio"}, |
95 | {ERR_FUNC(PEM_F_PEM_X509_INFO_WRITE_BIO), "PEM_X509_INFO_write_bio"}, | 91 | {ERR_PACK(0,PEM_F_PEM_X509_INFO_WRITE_BIO,0), "PEM_X509_INFO_write_bio"}, |
96 | {0,NULL} | 92 | {0,NULL} |
97 | }; | 93 | }; |
98 | 94 | ||
99 | static ERR_STRING_DATA PEM_str_reasons[]= | 95 | static ERR_STRING_DATA PEM_str_reasons[]= |
100 | { | 96 | { |
101 | {ERR_REASON(PEM_R_BAD_BASE64_DECODE) ,"bad base64 decode"}, | 97 | {PEM_R_BAD_BASE64_DECODE ,"bad base64 decode"}, |
102 | {ERR_REASON(PEM_R_BAD_DECRYPT) ,"bad decrypt"}, | 98 | {PEM_R_BAD_DECRYPT ,"bad decrypt"}, |
103 | {ERR_REASON(PEM_R_BAD_END_LINE) ,"bad end line"}, | 99 | {PEM_R_BAD_END_LINE ,"bad end line"}, |
104 | {ERR_REASON(PEM_R_BAD_IV_CHARS) ,"bad iv chars"}, | 100 | {PEM_R_BAD_IV_CHARS ,"bad iv chars"}, |
105 | {ERR_REASON(PEM_R_BAD_PASSWORD_READ) ,"bad password read"}, | 101 | {PEM_R_BAD_PASSWORD_READ ,"bad password read"}, |
106 | {ERR_REASON(PEM_R_ERROR_CONVERTING_PRIVATE_KEY),"error converting private key"}, | 102 | {PEM_R_ERROR_CONVERTING_PRIVATE_KEY ,"error converting private key"}, |
107 | {ERR_REASON(PEM_R_NOT_DEK_INFO) ,"not dek info"}, | 103 | {PEM_R_NOT_DEK_INFO ,"not dek info"}, |
108 | {ERR_REASON(PEM_R_NOT_ENCRYPTED) ,"not encrypted"}, | 104 | {PEM_R_NOT_ENCRYPTED ,"not encrypted"}, |
109 | {ERR_REASON(PEM_R_NOT_PROC_TYPE) ,"not proc type"}, | 105 | {PEM_R_NOT_PROC_TYPE ,"not proc type"}, |
110 | {ERR_REASON(PEM_R_NO_START_LINE) ,"no start line"}, | 106 | {PEM_R_NO_START_LINE ,"no start line"}, |
111 | {ERR_REASON(PEM_R_PROBLEMS_GETTING_PASSWORD),"problems getting password"}, | 107 | {PEM_R_PROBLEMS_GETTING_PASSWORD ,"problems getting password"}, |
112 | {ERR_REASON(PEM_R_PUBLIC_KEY_NO_RSA) ,"public key no rsa"}, | 108 | {PEM_R_PUBLIC_KEY_NO_RSA ,"public key no rsa"}, |
113 | {ERR_REASON(PEM_R_READ_KEY) ,"read key"}, | 109 | {PEM_R_READ_KEY ,"read key"}, |
114 | {ERR_REASON(PEM_R_SHORT_HEADER) ,"short header"}, | 110 | {PEM_R_SHORT_HEADER ,"short header"}, |
115 | {ERR_REASON(PEM_R_UNSUPPORTED_CIPHER) ,"unsupported cipher"}, | 111 | {PEM_R_UNSUPPORTED_CIPHER ,"unsupported cipher"}, |
116 | {ERR_REASON(PEM_R_UNSUPPORTED_ENCRYPTION),"unsupported encryption"}, | 112 | {PEM_R_UNSUPPORTED_ENCRYPTION ,"unsupported encryption"}, |
117 | {0,NULL} | 113 | {0,NULL} |
118 | }; | 114 | }; |
119 | 115 | ||
@@ -127,8 +123,8 @@ void ERR_load_PEM_strings(void) | |||
127 | { | 123 | { |
128 | init=0; | 124 | init=0; |
129 | #ifndef OPENSSL_NO_ERR | 125 | #ifndef OPENSSL_NO_ERR |
130 | ERR_load_strings(0,PEM_str_functs); | 126 | ERR_load_strings(ERR_LIB_PEM,PEM_str_functs); |
131 | ERR_load_strings(0,PEM_str_reasons); | 127 | ERR_load_strings(ERR_LIB_PEM,PEM_str_reasons); |
132 | #endif | 128 | #endif |
133 | 129 | ||
134 | } | 130 | } |