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

Side by Side Diff: openssl/crypto/ocsp/ocsp_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/ocsp/ocsp_cl.c ('k') | openssl/crypto/ocsp/ocsp_ext.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/ocsp/ocsp_err.c */ 1 /* crypto/ocsp/ocsp_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2007 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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 {ERR_FUNC(OCSP_F_OCSP_CHECK_DELEGATED), "OCSP_CHECK_DELEGATED"}, 79 {ERR_FUNC(OCSP_F_OCSP_CHECK_DELEGATED), "OCSP_CHECK_DELEGATED"},
80 {ERR_FUNC(OCSP_F_OCSP_CHECK_IDS), "OCSP_CHECK_IDS"}, 80 {ERR_FUNC(OCSP_F_OCSP_CHECK_IDS), "OCSP_CHECK_IDS"},
81 {ERR_FUNC(OCSP_F_OCSP_CHECK_ISSUER), "OCSP_CHECK_ISSUER"}, 81 {ERR_FUNC(OCSP_F_OCSP_CHECK_ISSUER), "OCSP_CHECK_ISSUER"},
82 {ERR_FUNC(OCSP_F_OCSP_CHECK_VALIDITY), "OCSP_check_validity"}, 82 {ERR_FUNC(OCSP_F_OCSP_CHECK_VALIDITY), "OCSP_check_validity"},
83 {ERR_FUNC(OCSP_F_OCSP_MATCH_ISSUERID), "OCSP_MATCH_ISSUERID"}, 83 {ERR_FUNC(OCSP_F_OCSP_MATCH_ISSUERID), "OCSP_MATCH_ISSUERID"},
84 {ERR_FUNC(OCSP_F_OCSP_PARSE_URL), "OCSP_parse_url"}, 84 {ERR_FUNC(OCSP_F_OCSP_PARSE_URL), "OCSP_parse_url"},
85 {ERR_FUNC(OCSP_F_OCSP_REQUEST_SIGN), "OCSP_request_sign"}, 85 {ERR_FUNC(OCSP_F_OCSP_REQUEST_SIGN), "OCSP_request_sign"},
86 {ERR_FUNC(OCSP_F_OCSP_REQUEST_VERIFY), "OCSP_request_verify"}, 86 {ERR_FUNC(OCSP_F_OCSP_REQUEST_VERIFY), "OCSP_request_verify"},
87 {ERR_FUNC(OCSP_F_OCSP_RESPONSE_GET1_BASIC), "OCSP_response_get1_basic"}, 87 {ERR_FUNC(OCSP_F_OCSP_RESPONSE_GET1_BASIC), "OCSP_response_get1_basic"},
88 {ERR_FUNC(OCSP_F_OCSP_SENDREQ_BIO), "OCSP_sendreq_bio"}, 88 {ERR_FUNC(OCSP_F_OCSP_SENDREQ_BIO), "OCSP_sendreq_bio"},
89 {ERR_FUNC(OCSP_F_OCSP_SENDREQ_NBIO), "OCSP_sendreq_nbio"},
89 {ERR_FUNC(OCSP_F_PARSE_HTTP_LINE1), "PARSE_HTTP_LINE1"}, 90 {ERR_FUNC(OCSP_F_PARSE_HTTP_LINE1), "PARSE_HTTP_LINE1"},
90 {ERR_FUNC(OCSP_F_REQUEST_VERIFY), "REQUEST_VERIFY"}, 91 {ERR_FUNC(OCSP_F_REQUEST_VERIFY), "REQUEST_VERIFY"},
91 {0,NULL} 92 {0,NULL}
92 }; 93 };
93 94
94 static ERR_STRING_DATA OCSP_str_reasons[]= 95 static ERR_STRING_DATA OCSP_str_reasons[]=
95 { 96 {
96 {ERR_REASON(OCSP_R_BAD_DATA) ,"bad data"}, 97 {ERR_REASON(OCSP_R_BAD_DATA) ,"bad data"},
97 {ERR_REASON(OCSP_R_CERTIFICATE_VERIFY_ERROR),"certificate verify error"}, 98 {ERR_REASON(OCSP_R_CERTIFICATE_VERIFY_ERROR),"certificate verify error"},
98 {ERR_REASON(OCSP_R_DIGEST_ERR) ,"digest err"}, 99 {ERR_REASON(OCSP_R_DIGEST_ERR) ,"digest err"},
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 { 133 {
133 #ifndef OPENSSL_NO_ERR 134 #ifndef OPENSSL_NO_ERR
134 135
135 if (ERR_func_error_string(OCSP_str_functs[0].error) == NULL) 136 if (ERR_func_error_string(OCSP_str_functs[0].error) == NULL)
136 { 137 {
137 ERR_load_strings(0,OCSP_str_functs); 138 ERR_load_strings(0,OCSP_str_functs);
138 ERR_load_strings(0,OCSP_str_reasons); 139 ERR_load_strings(0,OCSP_str_reasons);
139 } 140 }
140 #endif 141 #endif
141 } 142 }
OLDNEW
« no previous file with comments | « openssl/crypto/ocsp/ocsp_cl.c ('k') | openssl/crypto/ocsp/ocsp_ext.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698