diff options
Diffstat (limited to 'src/lib/libcrypto/ocsp/ocsp_err.c')
-rw-r--r-- | src/lib/libcrypto/ocsp/ocsp_err.c | 104 |
1 files changed, 50 insertions, 54 deletions
diff --git a/src/lib/libcrypto/ocsp/ocsp_err.c b/src/lib/libcrypto/ocsp/ocsp_err.c index 65e6093fbc..4c4d8306f8 100644 --- a/src/lib/libcrypto/ocsp/ocsp_err.c +++ b/src/lib/libcrypto/ocsp/ocsp_err.c | |||
@@ -1,6 +1,6 @@ | |||
1 | /* crypto/ocsp/ocsp_err.c */ | 1 | /* crypto/ocsp/ocsp_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,64 +64,60 @@ | |||
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_OCSP,func,0) | ||
69 | #define ERR_REASON(reason) ERR_PACK(ERR_LIB_OCSP,0,reason) | ||
70 | |||
71 | static ERR_STRING_DATA OCSP_str_functs[]= | 67 | static ERR_STRING_DATA OCSP_str_functs[]= |
72 | { | 68 | { |
73 | {ERR_FUNC(OCSP_F_ASN1_STRING_ENCODE), "ASN1_STRING_encode"}, | 69 | {ERR_PACK(0,OCSP_F_ASN1_STRING_ENCODE,0), "ASN1_STRING_encode"}, |
74 | {ERR_FUNC(OCSP_F_CERT_ID_NEW), "CERT_ID_NEW"}, | 70 | {ERR_PACK(0,OCSP_F_CERT_ID_NEW,0), "CERT_ID_NEW"}, |
75 | {ERR_FUNC(OCSP_F_D2I_OCSP_NONCE), "D2I_OCSP_NONCE"}, | 71 | {ERR_PACK(0,OCSP_F_D2I_OCSP_NONCE,0), "D2I_OCSP_NONCE"}, |
76 | {ERR_FUNC(OCSP_F_OCSP_BASIC_ADD1_STATUS), "OCSP_basic_add1_status"}, | 72 | {ERR_PACK(0,OCSP_F_OCSP_BASIC_ADD1_STATUS,0), "OCSP_basic_add1_status"}, |
77 | {ERR_FUNC(OCSP_F_OCSP_BASIC_SIGN), "OCSP_basic_sign"}, | 73 | {ERR_PACK(0,OCSP_F_OCSP_BASIC_SIGN,0), "OCSP_basic_sign"}, |
78 | {ERR_FUNC(OCSP_F_OCSP_BASIC_VERIFY), "OCSP_basic_verify"}, | 74 | {ERR_PACK(0,OCSP_F_OCSP_BASIC_VERIFY,0), "OCSP_basic_verify"}, |
79 | {ERR_FUNC(OCSP_F_OCSP_CHECK_DELEGATED), "OCSP_CHECK_DELEGATED"}, | 75 | {ERR_PACK(0,OCSP_F_OCSP_CHECK_DELEGATED,0), "OCSP_CHECK_DELEGATED"}, |
80 | {ERR_FUNC(OCSP_F_OCSP_CHECK_IDS), "OCSP_CHECK_IDS"}, | 76 | {ERR_PACK(0,OCSP_F_OCSP_CHECK_IDS,0), "OCSP_CHECK_IDS"}, |
81 | {ERR_FUNC(OCSP_F_OCSP_CHECK_ISSUER), "OCSP_CHECK_ISSUER"}, | 77 | {ERR_PACK(0,OCSP_F_OCSP_CHECK_ISSUER,0), "OCSP_CHECK_ISSUER"}, |
82 | {ERR_FUNC(OCSP_F_OCSP_CHECK_VALIDITY), "OCSP_check_validity"}, | 78 | {ERR_PACK(0,OCSP_F_OCSP_CHECK_VALIDITY,0), "OCSP_check_validity"}, |
83 | {ERR_FUNC(OCSP_F_OCSP_MATCH_ISSUERID), "OCSP_MATCH_ISSUERID"}, | 79 | {ERR_PACK(0,OCSP_F_OCSP_MATCH_ISSUERID,0), "OCSP_MATCH_ISSUERID"}, |
84 | {ERR_FUNC(OCSP_F_OCSP_PARSE_URL), "OCSP_parse_url"}, | 80 | {ERR_PACK(0,OCSP_F_OCSP_PARSE_URL,0), "OCSP_parse_url"}, |
85 | {ERR_FUNC(OCSP_F_OCSP_REQUEST_SIGN), "OCSP_request_sign"}, | 81 | {ERR_PACK(0,OCSP_F_OCSP_REQUEST_SIGN,0), "OCSP_request_sign"}, |
86 | {ERR_FUNC(OCSP_F_OCSP_REQUEST_VERIFY), "OCSP_request_verify"}, | 82 | {ERR_PACK(0,OCSP_F_OCSP_REQUEST_VERIFY,0), "OCSP_request_verify"}, |
87 | {ERR_FUNC(OCSP_F_OCSP_RESPONSE_GET1_BASIC), "OCSP_response_get1_basic"}, | 83 | {ERR_PACK(0,OCSP_F_OCSP_RESPONSE_GET1_BASIC,0), "OCSP_response_get1_basic"}, |
88 | {ERR_FUNC(OCSP_F_OCSP_SENDREQ_BIO), "OCSP_sendreq_bio"}, | 84 | {ERR_PACK(0,OCSP_F_OCSP_SENDREQ_BIO,0), "OCSP_sendreq_bio"}, |
89 | {ERR_FUNC(OCSP_F_REQUEST_VERIFY), "REQUEST_VERIFY"}, | 85 | {ERR_PACK(0,OCSP_F_REQUEST_VERIFY,0), "REQUEST_VERIFY"}, |
90 | {0,NULL} | 86 | {0,NULL} |
91 | }; | 87 | }; |
92 | 88 | ||
93 | static ERR_STRING_DATA OCSP_str_reasons[]= | 89 | static ERR_STRING_DATA OCSP_str_reasons[]= |
94 | { | 90 | { |
95 | {ERR_REASON(OCSP_R_BAD_DATA) ,"bad data"}, | 91 | {OCSP_R_BAD_DATA ,"bad data"}, |
96 | {ERR_REASON(OCSP_R_CERTIFICATE_VERIFY_ERROR),"certificate verify error"}, | 92 | {OCSP_R_CERTIFICATE_VERIFY_ERROR ,"certificate verify error"}, |
97 | {ERR_REASON(OCSP_R_DIGEST_ERR) ,"digest err"}, | 93 | {OCSP_R_DIGEST_ERR ,"digest err"}, |
98 | {ERR_REASON(OCSP_R_ERROR_IN_NEXTUPDATE_FIELD),"error in nextupdate field"}, | 94 | {OCSP_R_ERROR_IN_NEXTUPDATE_FIELD ,"error in nextupdate field"}, |
99 | {ERR_REASON(OCSP_R_ERROR_IN_THISUPDATE_FIELD),"error in thisupdate field"}, | 95 | {OCSP_R_ERROR_IN_THISUPDATE_FIELD ,"error in thisupdate field"}, |
100 | {ERR_REASON(OCSP_R_ERROR_PARSING_URL) ,"error parsing url"}, | 96 | {OCSP_R_ERROR_PARSING_URL ,"error parsing url"}, |
101 | {ERR_REASON(OCSP_R_MISSING_OCSPSIGNING_USAGE),"missing ocspsigning usage"}, | 97 | {OCSP_R_MISSING_OCSPSIGNING_USAGE ,"missing ocspsigning usage"}, |
102 | {ERR_REASON(OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE),"nextupdate before thisupdate"}, | 98 | {OCSP_R_NEXTUPDATE_BEFORE_THISUPDATE ,"nextupdate before thisupdate"}, |
103 | {ERR_REASON(OCSP_R_NOT_BASIC_RESPONSE) ,"not basic response"}, | 99 | {OCSP_R_NOT_BASIC_RESPONSE ,"not basic response"}, |
104 | {ERR_REASON(OCSP_R_NO_CERTIFICATES_IN_CHAIN),"no certificates in chain"}, | 100 | {OCSP_R_NO_CERTIFICATES_IN_CHAIN ,"no certificates in chain"}, |
105 | {ERR_REASON(OCSP_R_NO_CONTENT) ,"no content"}, | 101 | {OCSP_R_NO_CONTENT ,"no content"}, |
106 | {ERR_REASON(OCSP_R_NO_PUBLIC_KEY) ,"no public key"}, | 102 | {OCSP_R_NO_PUBLIC_KEY ,"no public key"}, |
107 | {ERR_REASON(OCSP_R_NO_RESPONSE_DATA) ,"no response data"}, | 103 | {OCSP_R_NO_RESPONSE_DATA ,"no response data"}, |
108 | {ERR_REASON(OCSP_R_NO_REVOKED_TIME) ,"no revoked time"}, | 104 | {OCSP_R_NO_REVOKED_TIME ,"no revoked time"}, |
109 | {ERR_REASON(OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE),"private key does not match certificate"}, | 105 | {OCSP_R_PRIVATE_KEY_DOES_NOT_MATCH_CERTIFICATE,"private key does not match certificate"}, |
110 | {ERR_REASON(OCSP_R_REQUEST_NOT_SIGNED) ,"request not signed"}, | 106 | {OCSP_R_REQUEST_NOT_SIGNED ,"request not signed"}, |
111 | {ERR_REASON(OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA),"response contains no revocation data"}, | 107 | {OCSP_R_RESPONSE_CONTAINS_NO_REVOCATION_DATA,"response contains no revocation data"}, |
112 | {ERR_REASON(OCSP_R_ROOT_CA_NOT_TRUSTED) ,"root ca not trusted"}, | 108 | {OCSP_R_ROOT_CA_NOT_TRUSTED ,"root ca not trusted"}, |
113 | {ERR_REASON(OCSP_R_SERVER_READ_ERROR) ,"server read error"}, | 109 | {OCSP_R_SERVER_READ_ERROR ,"server read error"}, |
114 | {ERR_REASON(OCSP_R_SERVER_RESPONSE_ERROR),"server response error"}, | 110 | {OCSP_R_SERVER_RESPONSE_ERROR ,"server response error"}, |
115 | {ERR_REASON(OCSP_R_SERVER_RESPONSE_PARSE_ERROR),"server response parse error"}, | 111 | {OCSP_R_SERVER_RESPONSE_PARSE_ERROR ,"server response parse error"}, |
116 | {ERR_REASON(OCSP_R_SERVER_WRITE_ERROR) ,"server write error"}, | 112 | {OCSP_R_SERVER_WRITE_ERROR ,"server write error"}, |
117 | {ERR_REASON(OCSP_R_SIGNATURE_FAILURE) ,"signature failure"}, | 113 | {OCSP_R_SIGNATURE_FAILURE ,"signature failure"}, |
118 | {ERR_REASON(OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND),"signer certificate not found"}, | 114 | {OCSP_R_SIGNER_CERTIFICATE_NOT_FOUND ,"signer certificate not found"}, |
119 | {ERR_REASON(OCSP_R_STATUS_EXPIRED) ,"status expired"}, | 115 | {OCSP_R_STATUS_EXPIRED ,"status expired"}, |
120 | {ERR_REASON(OCSP_R_STATUS_NOT_YET_VALID) ,"status not yet valid"}, | 116 | {OCSP_R_STATUS_NOT_YET_VALID ,"status not yet valid"}, |
121 | {ERR_REASON(OCSP_R_STATUS_TOO_OLD) ,"status too old"}, | 117 | {OCSP_R_STATUS_TOO_OLD ,"status too old"}, |
122 | {ERR_REASON(OCSP_R_UNKNOWN_MESSAGE_DIGEST),"unknown message digest"}, | 118 | {OCSP_R_UNKNOWN_MESSAGE_DIGEST ,"unknown message digest"}, |
123 | {ERR_REASON(OCSP_R_UNKNOWN_NID) ,"unknown nid"}, | 119 | {OCSP_R_UNKNOWN_NID ,"unknown nid"}, |
124 | {ERR_REASON(OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE),"unsupported requestorname type"}, | 120 | {OCSP_R_UNSUPPORTED_REQUESTORNAME_TYPE ,"unsupported requestorname type"}, |
125 | {0,NULL} | 121 | {0,NULL} |
126 | }; | 122 | }; |
127 | 123 | ||
@@ -135,8 +131,8 @@ void ERR_load_OCSP_strings(void) | |||
135 | { | 131 | { |
136 | init=0; | 132 | init=0; |
137 | #ifndef OPENSSL_NO_ERR | 133 | #ifndef OPENSSL_NO_ERR |
138 | ERR_load_strings(0,OCSP_str_functs); | 134 | ERR_load_strings(ERR_LIB_OCSP,OCSP_str_functs); |
139 | ERR_load_strings(0,OCSP_str_reasons); | 135 | ERR_load_strings(ERR_LIB_OCSP,OCSP_str_reasons); |
140 | #endif | 136 | #endif |
141 | 137 | ||
142 | } | 138 | } |