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

Side by Side Diff: openssl/ssl/d1_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/d1_lib.c ('k') | openssl/ssl/d1_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/d1_meth.h */ 1 /* ssl/d1_meth.h */
2 /* 2 /*
3 * DTLS implementation written by Nagendra Modadugu 3 * DTLS implementation written by Nagendra Modadugu
4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. 4 * (nagendra@cs.stanford.edu) for the OpenSSL project 2005.
5 */ 5 */
6 /* ==================================================================== 6 /* ====================================================================
7 * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved. 7 * Copyright (c) 1999-2005 The OpenSSL Project. All rights reserved.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 * This product includes cryptographic software written by Eric Young 54 * This product includes cryptographic software written by Eric Young
55 * (eay@cryptsoft.com). This product includes software written by Tim 55 * (eay@cryptsoft.com). This product includes software written by Tim
56 * Hudson (tjh@cryptsoft.com). 56 * Hudson (tjh@cryptsoft.com).
57 * 57 *
58 */ 58 */
59 59
60 #include <stdio.h> 60 #include <stdio.h>
61 #include <openssl/objects.h> 61 #include <openssl/objects.h>
62 #include "ssl_locl.h" 62 #include "ssl_locl.h"
63 63
64 static SSL_METHOD *dtls1_get_method(int ver); 64 static const SSL_METHOD *dtls1_get_method(int ver);
65 static SSL_METHOD *dtls1_get_method(int ver) 65 static const SSL_METHOD *dtls1_get_method(int ver)
66 { 66 {
67 if (ver == DTLS1_VERSION) 67 if (ver == DTLS1_VERSION)
68 return(DTLSv1_method()); 68 return(DTLSv1_method());
69 else 69 else
70 return(NULL); 70 return(NULL);
71 } 71 }
72 72
73 IMPLEMENT_dtls1_meth_func(DTLSv1_method, 73 IMPLEMENT_dtls1_meth_func(DTLSv1_method,
74 dtls1_accept, 74 dtls1_accept,
75 dtls1_connect, 75 dtls1_connect,
76 dtls1_get_method) 76 dtls1_get_method)
77 77
OLDNEW
« no previous file with comments | « openssl/ssl/d1_lib.c ('k') | openssl/ssl/d1_pkt.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698