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

Side by Side Diff: openssl/crypto/jpake/jpake_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/jpake/jpake.c ('k') | openssl/crypto/jpake/jpaketest.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/jpake/jpake_err.c */ 1 /* crypto/jpake/jpake_err.c */
2 /* ==================================================================== 2 /* ====================================================================
3 * Copyright (c) 1999-2008 The OpenSSL Project. All rights reserved. 3 * Copyright (c) 1999-2010 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 {ERR_FUNC(JPAKE_F_JPAKE_STEP1_PROCESS), "JPAKE_STEP1_process"}, 73 {ERR_FUNC(JPAKE_F_JPAKE_STEP1_PROCESS), "JPAKE_STEP1_process"},
74 {ERR_FUNC(JPAKE_F_JPAKE_STEP2_PROCESS), "JPAKE_STEP2_process"}, 74 {ERR_FUNC(JPAKE_F_JPAKE_STEP2_PROCESS), "JPAKE_STEP2_process"},
75 {ERR_FUNC(JPAKE_F_JPAKE_STEP3A_PROCESS), "JPAKE_STEP3A_process"}, 75 {ERR_FUNC(JPAKE_F_JPAKE_STEP3A_PROCESS), "JPAKE_STEP3A_process"},
76 {ERR_FUNC(JPAKE_F_JPAKE_STEP3B_PROCESS), "JPAKE_STEP3B_process"}, 76 {ERR_FUNC(JPAKE_F_JPAKE_STEP3B_PROCESS), "JPAKE_STEP3B_process"},
77 {ERR_FUNC(JPAKE_F_VERIFY_ZKP), "VERIFY_ZKP"}, 77 {ERR_FUNC(JPAKE_F_VERIFY_ZKP), "VERIFY_ZKP"},
78 {0,NULL} 78 {0,NULL}
79 }; 79 };
80 80
81 static ERR_STRING_DATA JPAKE_str_reasons[]= 81 static ERR_STRING_DATA JPAKE_str_reasons[]=
82 { 82 {
83 {ERR_REASON(JPAKE_R_G_TO_THE_X3_IS_NOT_LEGAL),"g to the x3 is not legal"},
84 {ERR_REASON(JPAKE_R_G_TO_THE_X4_IS_NOT_LEGAL),"g to the x4 is not legal"},
83 {ERR_REASON(JPAKE_R_G_TO_THE_X4_IS_ONE) ,"g to the x4 is one"}, 85 {ERR_REASON(JPAKE_R_G_TO_THE_X4_IS_ONE) ,"g to the x4 is one"},
84 {ERR_REASON(JPAKE_R_HASH_OF_HASH_OF_KEY_MISMATCH),"hash of hash of key mismatch" }, 86 {ERR_REASON(JPAKE_R_HASH_OF_HASH_OF_KEY_MISMATCH),"hash of hash of key mismatch" },
85 {ERR_REASON(JPAKE_R_HASH_OF_KEY_MISMATCH),"hash of key mismatch"}, 87 {ERR_REASON(JPAKE_R_HASH_OF_KEY_MISMATCH),"hash of key mismatch"},
86 {ERR_REASON(JPAKE_R_VERIFY_B_FAILED) ,"verify b failed"}, 88 {ERR_REASON(JPAKE_R_VERIFY_B_FAILED) ,"verify b failed"},
87 {ERR_REASON(JPAKE_R_VERIFY_X3_FAILED) ,"verify x3 failed"}, 89 {ERR_REASON(JPAKE_R_VERIFY_X3_FAILED) ,"verify x3 failed"},
88 {ERR_REASON(JPAKE_R_VERIFY_X4_FAILED) ,"verify x4 failed"}, 90 {ERR_REASON(JPAKE_R_VERIFY_X4_FAILED) ,"verify x4 failed"},
89 {ERR_REASON(JPAKE_R_ZKP_VERIFY_FAILED) ,"zkp verify failed"}, 91 {ERR_REASON(JPAKE_R_ZKP_VERIFY_FAILED) ,"zkp verify failed"},
90 {0,NULL} 92 {0,NULL}
91 }; 93 };
92 94
93 #endif 95 #endif
94 96
95 void ERR_load_JPAKE_strings(void) 97 void ERR_load_JPAKE_strings(void)
96 { 98 {
97 #ifndef OPENSSL_NO_ERR 99 #ifndef OPENSSL_NO_ERR
98 100
99 if (ERR_func_error_string(JPAKE_str_functs[0].error) == NULL) 101 if (ERR_func_error_string(JPAKE_str_functs[0].error) == NULL)
100 { 102 {
101 ERR_load_strings(0,JPAKE_str_functs); 103 ERR_load_strings(0,JPAKE_str_functs);
102 ERR_load_strings(0,JPAKE_str_reasons); 104 ERR_load_strings(0,JPAKE_str_reasons);
103 } 105 }
104 #endif 106 #endif
105 } 107 }
OLDNEW
« no previous file with comments | « openssl/crypto/jpake/jpake.c ('k') | openssl/crypto/jpake/jpaketest.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698