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

Side by Side Diff: openssl/ssl/t1_srvr.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/t1_meth.c ('k') | openssl/ssl/tls1.h » ('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/t1_srvr.c */ 1 /* ssl/t1_srvr.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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 */ 57 */
58 58
59 #include <stdio.h> 59 #include <stdio.h>
60 #include "ssl_locl.h" 60 #include "ssl_locl.h"
61 #include <openssl/buffer.h> 61 #include <openssl/buffer.h>
62 #include <openssl/rand.h> 62 #include <openssl/rand.h>
63 #include <openssl/objects.h> 63 #include <openssl/objects.h>
64 #include <openssl/evp.h> 64 #include <openssl/evp.h>
65 #include <openssl/x509.h> 65 #include <openssl/x509.h>
66 66
67 static SSL_METHOD *tls1_get_server_method(int ver); 67 static const SSL_METHOD *tls1_get_server_method(int ver);
68 static SSL_METHOD *tls1_get_server_method(int ver) 68 static const SSL_METHOD *tls1_get_server_method(int ver)
69 { 69 {
70 if (ver == TLS1_VERSION) 70 if (ver == TLS1_VERSION)
71 return(TLSv1_server_method()); 71 return(TLSv1_server_method());
72 else 72 else
73 return(NULL); 73 return(NULL);
74 } 74 }
75 75
76 IMPLEMENT_tls1_meth_func(TLSv1_server_method, 76 IMPLEMENT_tls1_meth_func(TLSv1_server_method,
77 ssl3_accept, 77 ssl3_accept,
78 ssl_undefined_function, 78 ssl_undefined_function,
79 tls1_get_server_method) 79 tls1_get_server_method)
80 80
OLDNEW
« no previous file with comments | « openssl/ssl/t1_meth.c ('k') | openssl/ssl/tls1.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698