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

Side by Side Diff: openssl/crypto/ecdh/ech_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/ecdh/ecdhtest.c ('k') | openssl/crypto/ecdh/ech_lib.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/ecdh/ech_err.c */ 1 /* crypto/ecdh/ech_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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
64 64
65 /* BEGIN ERROR CODES */ 65 /* BEGIN ERROR CODES */
66 #ifndef OPENSSL_NO_ERR 66 #ifndef OPENSSL_NO_ERR
67 67
68 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDH,func,0) 68 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_ECDH,func,0)
69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDH,0,reason) 69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_ECDH,0,reason)
70 70
71 static ERR_STRING_DATA ECDH_str_functs[]= 71 static ERR_STRING_DATA ECDH_str_functs[]=
72 { 72 {
73 {ERR_FUNC(ECDH_F_ECDH_COMPUTE_KEY), "ECDH_compute_key"}, 73 {ERR_FUNC(ECDH_F_ECDH_COMPUTE_KEY), "ECDH_compute_key"},
74 {ERR_FUNC(ECDH_F_ECDH_DATA_NEW_METHOD),»"ECDH_DATA_NEW_METHOD"}, 74 {ERR_FUNC(ECDH_F_ECDH_DATA_NEW_METHOD),»"ECDH_DATA_new_method"},
75 {0,NULL} 75 {0,NULL}
76 }; 76 };
77 77
78 static ERR_STRING_DATA ECDH_str_reasons[]= 78 static ERR_STRING_DATA ECDH_str_reasons[]=
79 { 79 {
80 {ERR_REASON(ECDH_R_KDF_FAILED) ,"KDF failed"}, 80 {ERR_REASON(ECDH_R_KDF_FAILED) ,"KDF failed"},
81 {ERR_REASON(ECDH_R_NO_PRIVATE_VALUE) ,"no private value"}, 81 {ERR_REASON(ECDH_R_NO_PRIVATE_VALUE) ,"no private value"},
82 {ERR_REASON(ECDH_R_POINT_ARITHMETIC_FAILURE),"point arithmetic failure"}, 82 {ERR_REASON(ECDH_R_POINT_ARITHMETIC_FAILURE),"point arithmetic failure"},
83 {0,NULL} 83 {0,NULL}
84 }; 84 };
85 85
86 #endif 86 #endif
87 87
88 void ERR_load_ECDH_strings(void) 88 void ERR_load_ECDH_strings(void)
89 { 89 {
90 #ifndef OPENSSL_NO_ERR 90 #ifndef OPENSSL_NO_ERR
91 91
92 if (ERR_func_error_string(ECDH_str_functs[0].error) == NULL) 92 if (ERR_func_error_string(ECDH_str_functs[0].error) == NULL)
93 { 93 {
94 ERR_load_strings(0,ECDH_str_functs); 94 ERR_load_strings(0,ECDH_str_functs);
95 ERR_load_strings(0,ECDH_str_reasons); 95 ERR_load_strings(0,ECDH_str_reasons);
96 } 96 }
97 #endif 97 #endif
98 } 98 }
OLDNEW
« no previous file with comments | « openssl/crypto/ecdh/ecdhtest.c ('k') | openssl/crypto/ecdh/ech_lib.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698