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

Side by Side Diff: openssl/crypto/dh/dh_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/dh/dh_check.c ('k') | openssl/crypto/dh/dh_gen.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/dh/dh_err.c */ 1 /* crypto/dh/dh_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 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_DH,func,0) 68 #define ERR_FUNC(func) ERR_PACK(ERR_LIB_DH,func,0)
69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason) 69 #define ERR_REASON(reason) ERR_PACK(ERR_LIB_DH,0,reason)
70 70
71 static ERR_STRING_DATA DH_str_functs[]= 71 static ERR_STRING_DATA DH_str_functs[]=
72 { 72 {
73 {ERR_FUNC(DH_F_COMPUTE_KEY), "COMPUTE_KEY"}, 73 {ERR_FUNC(DH_F_COMPUTE_KEY), "COMPUTE_KEY"},
74 {ERR_FUNC(DH_F_DHPARAMS_PRINT), "DHparams_print"},
75 {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP), "DHparams_print_fp"}, 74 {ERR_FUNC(DH_F_DHPARAMS_PRINT_FP), "DHparams_print_fp"},
76 {ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS), "DH_BUILTIN_GENPARAMS"}, 75 {ERR_FUNC(DH_F_DH_BUILTIN_GENPARAMS), "DH_BUILTIN_GENPARAMS"},
77 {ERR_FUNC(DH_F_DH_COMPUTE_KEY), "DH_compute_key"},
78 {ERR_FUNC(DH_F_DH_GENERATE_KEY), "DH_generate_key"},
79 {ERR_FUNC(DH_F_DH_GENERATE_PARAMETERS), "DH_generate_parameters"},
80 {ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"}, 76 {ERR_FUNC(DH_F_DH_NEW_METHOD), "DH_new_method"},
77 {ERR_FUNC(DH_F_DH_PARAM_DECODE), "DH_PARAM_DECODE"},
78 {ERR_FUNC(DH_F_DH_PRIV_DECODE), "DH_PRIV_DECODE"},
79 {ERR_FUNC(DH_F_DH_PRIV_ENCODE), "DH_PRIV_ENCODE"},
80 {ERR_FUNC(DH_F_DH_PUB_DECODE), "DH_PUB_DECODE"},
81 {ERR_FUNC(DH_F_DH_PUB_ENCODE), "DH_PUB_ENCODE"},
82 {ERR_FUNC(DH_F_DO_DH_PRINT), "DO_DH_PRINT"},
81 {ERR_FUNC(DH_F_GENERATE_KEY), "GENERATE_KEY"}, 83 {ERR_FUNC(DH_F_GENERATE_KEY), "GENERATE_KEY"},
82 {ERR_FUNC(DH_F_GENERATE_PARAMETERS), "GENERATE_PARAMETERS"}, 84 {ERR_FUNC(DH_F_GENERATE_PARAMETERS), "GENERATE_PARAMETERS"},
85 {ERR_FUNC(DH_F_PKEY_DH_DERIVE), "PKEY_DH_DERIVE"},
86 {ERR_FUNC(DH_F_PKEY_DH_KEYGEN), "PKEY_DH_KEYGEN"},
83 {0,NULL} 87 {0,NULL}
84 }; 88 };
85 89
86 static ERR_STRING_DATA DH_str_reasons[]= 90 static ERR_STRING_DATA DH_str_reasons[]=
87 { 91 {
88 {ERR_REASON(DH_R_BAD_GENERATOR) ,"bad generator"}, 92 {ERR_REASON(DH_R_BAD_GENERATOR) ,"bad generator"},
93 {ERR_REASON(DH_R_BN_DECODE_ERROR) ,"bn decode error"},
94 {ERR_REASON(DH_R_BN_ERROR) ,"bn error"},
95 {ERR_REASON(DH_R_DECODE_ERROR) ,"decode error"},
89 {ERR_REASON(DH_R_INVALID_PUBKEY) ,"invalid public key"}, 96 {ERR_REASON(DH_R_INVALID_PUBKEY) ,"invalid public key"},
90 {ERR_REASON(DH_R_KEY_SIZE_TOO_SMALL) ,"key size too small"}, 97 {ERR_REASON(DH_R_KEYS_NOT_SET) ,"keys not set"},
91 {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"}, 98 {ERR_REASON(DH_R_MODULUS_TOO_LARGE) ,"modulus too large"},
99 {ERR_REASON(DH_R_NO_PARAMETERS_SET) ,"no parameters set"},
92 {ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"}, 100 {ERR_REASON(DH_R_NO_PRIVATE_VALUE) ,"no private value"},
101 {ERR_REASON(DH_R_PARAMETER_ENCODING_ERROR),"parameter encoding error"},
93 {0,NULL} 102 {0,NULL}
94 }; 103 };
95 104
96 #endif 105 #endif
97 106
98 void ERR_load_DH_strings(void) 107 void ERR_load_DH_strings(void)
99 { 108 {
100 #ifndef OPENSSL_NO_ERR 109 #ifndef OPENSSL_NO_ERR
101 110
102 if (ERR_func_error_string(DH_str_functs[0].error) == NULL) 111 if (ERR_func_error_string(DH_str_functs[0].error) == NULL)
103 { 112 {
104 ERR_load_strings(0,DH_str_functs); 113 ERR_load_strings(0,DH_str_functs);
105 ERR_load_strings(0,DH_str_reasons); 114 ERR_load_strings(0,DH_str_reasons);
106 } 115 }
107 #endif 116 #endif
108 } 117 }
OLDNEW
« no previous file with comments | « openssl/crypto/dh/dh_check.c ('k') | openssl/crypto/dh/dh_gen.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698