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

Side by Side Diff: openssl/crypto/objects/obj_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/objects/obj_dat.pl ('k') | openssl/crypto/objects/obj_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/objects/obj_err.c */ 1 /* crypto/objects/obj_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 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 { 93 {
94 #ifndef OPENSSL_NO_ERR 94 #ifndef OPENSSL_NO_ERR
95 95
96 if (ERR_func_error_string(OBJ_str_functs[0].error) == NULL) 96 if (ERR_func_error_string(OBJ_str_functs[0].error) == NULL)
97 { 97 {
98 ERR_load_strings(0,OBJ_str_functs); 98 ERR_load_strings(0,OBJ_str_functs);
99 ERR_load_strings(0,OBJ_str_reasons); 99 ERR_load_strings(0,OBJ_str_reasons);
100 } 100 }
101 #endif 101 #endif
102 } 102 }
OLDNEW
« no previous file with comments | « openssl/crypto/objects/obj_dat.pl ('k') | openssl/crypto/objects/obj_lib.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698