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

Side by Side Diff: openssl/engines/e_capi_err.h

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/engines/e_capi.c ('k') | openssl/engines/e_capi_err.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 /* ==================================================================== 1 /* ====================================================================
2 * Copyright (c) 2001-2008 The OpenSSL Project. All rights reserved. 2 * Copyright (c) 2001-2008 The OpenSSL Project. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 10 *
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 * 48 *
49 * This product includes cryptographic software written by Eric Young 49 * This product includes cryptographic software written by Eric Young
50 * (eay@cryptsoft.com). This product includes software written by Tim 50 * (eay@cryptsoft.com). This product includes software written by Tim
51 * Hudson (tjh@cryptsoft.com). 51 * Hudson (tjh@cryptsoft.com).
52 * 52 *
53 */ 53 */
54 54
55 #ifndef HEADER_CAPI_ERR_H 55 #ifndef HEADER_CAPI_ERR_H
56 #define HEADER_CAPI_ERR_H 56 #define HEADER_CAPI_ERR_H
57 57
58 #ifdef __cplusplus
59 extern "C" {
60 #endif
61
58 /* BEGIN ERROR CODES */ 62 /* BEGIN ERROR CODES */
59 /* The following lines are auto generated by the script mkerr.pl. Any changes 63 /* The following lines are auto generated by the script mkerr.pl. Any changes
60 * made after this point may be overwritten when the script is next run. 64 * made after this point may be overwritten when the script is next run.
61 */ 65 */
62 static void ERR_load_CAPI_strings(void); 66 static void ERR_load_CAPI_strings(void);
63 static void ERR_unload_CAPI_strings(void); 67 static void ERR_unload_CAPI_strings(void);
64 static void ERR_CAPI_error(int function, int reason, char *file, int line); 68 static void ERR_CAPI_error(int function, int reason, char *file, int line);
65 #define CAPIerr(f,r) ERR_CAPI_error((f),(r),__FILE__,__LINE__) 69 #define CAPIerr(f,r) ERR_CAPI_error((f),(r),__FILE__,__LINE__)
66 70
67 /* Error codes for the CAPI functions. */ 71 /* Error codes for the CAPI functions. */
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 #define CAPI_R_UNKNOWN_COMMAND 118 119 #define CAPI_R_UNKNOWN_COMMAND 118
116 #define CAPI_R_UNSUPPORTED_ALGORITHM_NID 119 120 #define CAPI_R_UNSUPPORTED_ALGORITHM_NID 119
117 #define CAPI_R_UNSUPPORTED_PADDING 120 121 #define CAPI_R_UNSUPPORTED_PADDING 120
118 #define CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM 121 122 #define CAPI_R_UNSUPPORTED_PUBLIC_KEY_ALGORITHM 121
119 #define CAPI_R_WIN32_ERROR 127 123 #define CAPI_R_WIN32_ERROR 127
120 124
121 #ifdef __cplusplus 125 #ifdef __cplusplus
122 } 126 }
123 #endif 127 #endif
124 #endif 128 #endif
OLDNEW
« no previous file with comments | « openssl/engines/e_capi.c ('k') | openssl/engines/e_capi_err.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698