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

Side by Side Diff: openssl/ssl/ssl_sess.c

Issue 35493002: Update Channel ID API to use a callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/openssl.git@master
Patch Set: Fix key ownsership Created 7 years, 1 month 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
« no previous file with comments | « openssl/ssl/ssl.h ('k') | patches.chromium/channelid.patch » ('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/ssl_sess.c */ 1 /* ssl/ssl_sess.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 1114 matching lines...) Expand 10 before | Expand all | Expand 10 after
1125 int (*cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey)) 1125 int (*cb)(SSL *ssl, X509 **x509, EVP_PKEY **pkey))
1126 { 1126 {
1127 ctx->client_cert_cb=cb; 1127 ctx->client_cert_cb=cb;
1128 } 1128 }
1129 1129
1130 int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * ssl, X509 ** x509 , EVP_PK EY **pkey) 1130 int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * ssl, X509 ** x509 , EVP_PK EY **pkey)
1131 { 1131 {
1132 return ctx->client_cert_cb; 1132 return ctx->client_cert_cb;
1133 } 1133 }
1134 1134
1135 void SSL_CTX_set_channel_id_cb(SSL_CTX *ctx,
1136 void (*cb)(SSL *ssl, EVP_PKEY **pkey))
1137 {
1138 ctx->channel_id_cb=cb;
1139 }
1140
1141 void (*SSL_CTX_get_channel_id_cb(SSL_CTX *ctx))(SSL * ssl, EVP_PKEY **pkey)
1142 {
1143 return ctx->channel_id_cb;
1144 }
1145
1135 #ifndef OPENSSL_NO_ENGINE 1146 #ifndef OPENSSL_NO_ENGINE
1136 int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e) 1147 int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e)
1137 { 1148 {
1138 if (!ENGINE_init(e)) 1149 if (!ENGINE_init(e))
1139 { 1150 {
1140 SSLerr(SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE, ERR_R_ENGINE_LIB); 1151 SSLerr(SSL_F_SSL_CTX_SET_CLIENT_CERT_ENGINE, ERR_R_ENGINE_LIB);
1141 return 0; 1152 return 0;
1142 } 1153 }
1143 if(!ENGINE_get_ssl_client_cert_function(e)) 1154 if(!ENGINE_get_ssl_client_cert_function(e))
1144 { 1155 {
(...skipping 12 matching lines...) Expand all
1157 ctx->app_gen_cookie_cb=cb; 1168 ctx->app_gen_cookie_cb=cb;
1158 } 1169 }
1159 1170
1160 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx, 1171 void SSL_CTX_set_cookie_verify_cb(SSL_CTX *ctx,
1161 int (*cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len)) 1172 int (*cb)(SSL *ssl, unsigned char *cookie, unsigned int cookie_len))
1162 { 1173 {
1163 ctx->app_verify_cookie_cb=cb; 1174 ctx->app_verify_cookie_cb=cb;
1164 } 1175 }
1165 1176
1166 IMPLEMENT_PEM_rw(SSL_SESSION, SSL_SESSION, PEM_STRING_SSL_SESSION, SSL_SESSION) 1177 IMPLEMENT_PEM_rw(SSL_SESSION, SSL_SESSION, PEM_STRING_SSL_SESSION, SSL_SESSION)
OLDNEW
« no previous file with comments | « openssl/ssl/ssl.h ('k') | patches.chromium/channelid.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698