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

Side by Side Diff: openssl/ssl/s2_meth.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/ssl/s2_lib.c ('k') | openssl/ssl/s2_pkt.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 /* ssl/s2_meth.c */ 1 /* ssl/s2_meth.c */
2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
5 * This package is an SSL implementation written 5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com). 6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL. 7 * The implementation was written so as to conform with Netscapes SSL.
8 * 8 *
9 * This library is free for commercial and non-commercial use as long as 9 * This library is free for commercial and non-commercial use as long as
10 * the following conditions are aheared to. The following conditions 10 * the following conditions are aheared to. The following conditions
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 * derivative of this code cannot be changed. i.e. this code cannot simply be 54 * derivative of this code cannot be changed. i.e. this code cannot simply be
55 * copied and put under another distribution licence 55 * copied and put under another distribution licence
56 * [including the GNU Public Licence.] 56 * [including the GNU Public Licence.]
57 */ 57 */
58 58
59 #include "ssl_locl.h" 59 #include "ssl_locl.h"
60 #ifndef OPENSSL_NO_SSL2 60 #ifndef OPENSSL_NO_SSL2
61 #include <stdio.h> 61 #include <stdio.h>
62 #include <openssl/objects.h> 62 #include <openssl/objects.h>
63 63
64 static SSL_METHOD *ssl2_get_method(int ver); 64 static const SSL_METHOD *ssl2_get_method(int ver);
65 static SSL_METHOD *ssl2_get_method(int ver) 65 static const SSL_METHOD *ssl2_get_method(int ver)
66 { 66 {
67 if (ver == SSL2_VERSION) 67 if (ver == SSL2_VERSION)
68 return(SSLv2_method()); 68 return(SSLv2_method());
69 else 69 else
70 return(NULL); 70 return(NULL);
71 } 71 }
72 72
73 IMPLEMENT_ssl2_meth_func(SSLv2_method, 73 IMPLEMENT_ssl2_meth_func(SSLv2_method,
74 » » » ssl2_accept, 74 » » » ssl2_accept,
75 » » » ssl2_connect, 75 » » » ssl2_connect,
76 » » » ssl2_get_method) 76 » » » ssl2_get_method)
77 77
78 #else /* !OPENSSL_NO_SSL2 */ 78 #else /* !OPENSSL_NO_SSL2 */
79 79
80 # if PEDANTIC 80 # if PEDANTIC
81 static void *dummy=&dummy; 81 static void *dummy=&dummy;
82 # endif 82 # endif
83 83
84 #endif 84 #endif
OLDNEW
« no previous file with comments | « openssl/ssl/s2_lib.c ('k') | openssl/ssl/s2_pkt.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698