Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(234)

Side by Side Diff: openssl/crypto/x509/x509_err.c

Issue 9254031: Upgrade chrome's OpenSSL to same version Android ships with. (Closed) Base URL: http://src.chromium.org/svn/trunk/deps/third_party/openssl/
Patch Set: '' Created 8 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « openssl/crypto/x509/x509_cmp.c ('k') | openssl/crypto/x509/x509_lu.c » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* crypto/x509/x509_err.c */ 1 /* crypto/x509/x509_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2006 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
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
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
125 {ERR_REASON(X509_R_CANT_CHECK_DH_KEY) ,"cant check dh key"}, 125 {ERR_REASON(X509_R_CANT_CHECK_DH_KEY) ,"cant check dh key"},
126 {ERR_REASON(X509_R_CERT_ALREADY_IN_HASH_TABLE),"cert already in hash table"}, 126 {ERR_REASON(X509_R_CERT_ALREADY_IN_HASH_TABLE),"cert already in hash table"},
127 {ERR_REASON(X509_R_ERR_ASN1_LIB) ,"err asn1 lib"}, 127 {ERR_REASON(X509_R_ERR_ASN1_LIB) ,"err asn1 lib"},
128 {ERR_REASON(X509_R_INVALID_DIRECTORY) ,"invalid directory"}, 128 {ERR_REASON(X509_R_INVALID_DIRECTORY) ,"invalid directory"},
129 {ERR_REASON(X509_R_INVALID_FIELD_NAME) ,"invalid field name"}, 129 {ERR_REASON(X509_R_INVALID_FIELD_NAME) ,"invalid field name"},
130 {ERR_REASON(X509_R_INVALID_TRUST) ,"invalid trust"}, 130 {ERR_REASON(X509_R_INVALID_TRUST) ,"invalid trust"},
131 {ERR_REASON(X509_R_KEY_TYPE_MISMATCH) ,"key type mismatch"}, 131 {ERR_REASON(X509_R_KEY_TYPE_MISMATCH) ,"key type mismatch"},
132 {ERR_REASON(X509_R_KEY_VALUES_MISMATCH) ,"key values mismatch"}, 132 {ERR_REASON(X509_R_KEY_VALUES_MISMATCH) ,"key values mismatch"},
133 {ERR_REASON(X509_R_LOADING_CERT_DIR) ,"loading cert dir"}, 133 {ERR_REASON(X509_R_LOADING_CERT_DIR) ,"loading cert dir"},
134 {ERR_REASON(X509_R_LOADING_DEFAULTS) ,"loading defaults"}, 134 {ERR_REASON(X509_R_LOADING_DEFAULTS) ,"loading defaults"},
135 {ERR_REASON(X509_R_METHOD_NOT_SUPPORTED) ,"method not supported"},
135 {ERR_REASON(X509_R_NO_CERT_SET_FOR_US_TO_VERIFY),"no cert set for us to verify"} , 136 {ERR_REASON(X509_R_NO_CERT_SET_FOR_US_TO_VERIFY),"no cert set for us to verify"} ,
137 {ERR_REASON(X509_R_PUBLIC_KEY_DECODE_ERROR),"public key decode error"},
138 {ERR_REASON(X509_R_PUBLIC_KEY_ENCODE_ERROR),"public key encode error"},
136 {ERR_REASON(X509_R_SHOULD_RETRY) ,"should retry"}, 139 {ERR_REASON(X509_R_SHOULD_RETRY) ,"should retry"},
137 {ERR_REASON(X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN),"unable to find parameter s in chain"}, 140 {ERR_REASON(X509_R_UNABLE_TO_FIND_PARAMETERS_IN_CHAIN),"unable to find parameter s in chain"},
138 {ERR_REASON(X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY),"unable to get certs public k ey"}, 141 {ERR_REASON(X509_R_UNABLE_TO_GET_CERTS_PUBLIC_KEY),"unable to get certs public k ey"},
139 {ERR_REASON(X509_R_UNKNOWN_KEY_TYPE) ,"unknown key type"}, 142 {ERR_REASON(X509_R_UNKNOWN_KEY_TYPE) ,"unknown key type"},
140 {ERR_REASON(X509_R_UNKNOWN_NID) ,"unknown nid"}, 143 {ERR_REASON(X509_R_UNKNOWN_NID) ,"unknown nid"},
141 {ERR_REASON(X509_R_UNKNOWN_PURPOSE_ID) ,"unknown purpose id"}, 144 {ERR_REASON(X509_R_UNKNOWN_PURPOSE_ID) ,"unknown purpose id"},
142 {ERR_REASON(X509_R_UNKNOWN_TRUST_ID) ,"unknown trust id"}, 145 {ERR_REASON(X509_R_UNKNOWN_TRUST_ID) ,"unknown trust id"},
143 {ERR_REASON(X509_R_UNSUPPORTED_ALGORITHM),"unsupported algorithm"}, 146 {ERR_REASON(X509_R_UNSUPPORTED_ALGORITHM),"unsupported algorithm"},
144 {ERR_REASON(X509_R_WRONG_LOOKUP_TYPE) ,"wrong lookup type"}, 147 {ERR_REASON(X509_R_WRONG_LOOKUP_TYPE) ,"wrong lookup type"},
145 {ERR_REASON(X509_R_WRONG_TYPE) ,"wrong type"}, 148 {ERR_REASON(X509_R_WRONG_TYPE) ,"wrong type"},
146 {0,NULL} 149 {0,NULL}
147 }; 150 };
148 151
149 #endif 152 #endif
150 153
151 void ERR_load_X509_strings(void) 154 void ERR_load_X509_strings(void)
152 { 155 {
153 #ifndef OPENSSL_NO_ERR 156 #ifndef OPENSSL_NO_ERR
154 157
155 if (ERR_func_error_string(X509_str_functs[0].error) == NULL) 158 if (ERR_func_error_string(X509_str_functs[0].error) == NULL)
156 { 159 {
157 ERR_load_strings(0,X509_str_functs); 160 ERR_load_strings(0,X509_str_functs);
158 ERR_load_strings(0,X509_str_reasons); 161 ERR_load_strings(0,X509_str_reasons);
159 } 162 }
160 #endif 163 #endif
161 } 164 }
OLDNEW
« no previous file with comments | « openssl/crypto/x509/x509_cmp.c ('k') | openssl/crypto/x509/x509_lu.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698