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

Side by Side Diff: openssl/crypto/cms/cms_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/cms/cms_env.c ('k') | openssl/crypto/cms/cms_ess.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/cms/cms_err.c */ 1 /* crypto/cms/cms_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2008 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2007 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 112 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 {ERR_FUNC(CMS_F_CMS_SET1_SIGNERIDENTIFIER), "cms_set1_SignerIdentifier"}, 126 {ERR_FUNC(CMS_F_CMS_SET1_SIGNERIDENTIFIER), "cms_set1_SignerIdentifier"},
127 {ERR_FUNC(CMS_F_CMS_SET_DETACHED), "CMS_set_detached"}, 127 {ERR_FUNC(CMS_F_CMS_SET_DETACHED), "CMS_set_detached"},
128 {ERR_FUNC(CMS_F_CMS_SIGN), "CMS_sign"}, 128 {ERR_FUNC(CMS_F_CMS_SIGN), "CMS_sign"},
129 {ERR_FUNC(CMS_F_CMS_SIGNED_DATA_INIT), "CMS_SIGNED_DATA_INIT"}, 129 {ERR_FUNC(CMS_F_CMS_SIGNED_DATA_INIT), "CMS_SIGNED_DATA_INIT"},
130 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN), "CMS_SIGNERINFO_CONTENT_SIGN"}, 130 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_CONTENT_SIGN), "CMS_SIGNERINFO_CONTENT_SIGN"},
131 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_SIGN), "CMS_SignerInfo_sign"}, 131 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_SIGN), "CMS_SignerInfo_sign"},
132 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY), "CMS_SignerInfo_verify"}, 132 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY), "CMS_SignerInfo_verify"},
133 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CERT), "CMS_SIGNERINFO_VERIFY_CERT"}, 133 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CERT), "CMS_SIGNERINFO_VERIFY_CERT"},
134 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT), "CMS_SignerInfo_verify_content"} , 134 {ERR_FUNC(CMS_F_CMS_SIGNERINFO_VERIFY_CONTENT), "CMS_SignerInfo_verify_content"} ,
135 {ERR_FUNC(CMS_F_CMS_SIGN_RECEIPT), "CMS_sign_receipt"}, 135 {ERR_FUNC(CMS_F_CMS_SIGN_RECEIPT), "CMS_sign_receipt"},
136 {ERR_FUNC(CMS_F_CMS_STREAM),» "CMS_STREAM"}, 136 {ERR_FUNC(CMS_F_CMS_STREAM),» "CMS_stream"},
137 {ERR_FUNC(CMS_F_CMS_UNCOMPRESS), "CMS_uncompress"}, 137 {ERR_FUNC(CMS_F_CMS_UNCOMPRESS), "CMS_uncompress"},
138 {ERR_FUNC(CMS_F_CMS_VERIFY), "CMS_verify"}, 138 {ERR_FUNC(CMS_F_CMS_VERIFY), "CMS_verify"},
139 {0,NULL} 139 {0,NULL}
140 }; 140 };
141 141
142 static ERR_STRING_DATA CMS_str_reasons[]= 142 static ERR_STRING_DATA CMS_str_reasons[]=
143 { 143 {
144 {ERR_REASON(CMS_R_ADD_SIGNER_ERROR) ,"add signer error"}, 144 {ERR_REASON(CMS_R_ADD_SIGNER_ERROR) ,"add signer error"},
145 {ERR_REASON(CMS_R_CERTIFICATE_ALREADY_PRESENT),"certificate already present"}, 145 {ERR_REASON(CMS_R_CERTIFICATE_ALREADY_PRESENT),"certificate already present"},
146 {ERR_REASON(CMS_R_CERTIFICATE_HAS_NO_KEYID),"certificate has no keyid"}, 146 {ERR_REASON(CMS_R_CERTIFICATE_HAS_NO_KEYID),"certificate has no keyid"},
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 { 227 {
228 #ifndef OPENSSL_NO_ERR 228 #ifndef OPENSSL_NO_ERR
229 229
230 if (ERR_func_error_string(CMS_str_functs[0].error) == NULL) 230 if (ERR_func_error_string(CMS_str_functs[0].error) == NULL)
231 { 231 {
232 ERR_load_strings(0,CMS_str_functs); 232 ERR_load_strings(0,CMS_str_functs);
233 ERR_load_strings(0,CMS_str_reasons); 233 ERR_load_strings(0,CMS_str_reasons);
234 } 234 }
235 #endif 235 #endif
236 } 236 }
OLDNEW
« no previous file with comments | « openssl/crypto/cms/cms_env.c ('k') | openssl/crypto/cms/cms_ess.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698