summaryrefslogtreecommitdiff
path: root/app/openssl/ssl/ssl_sess.c
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-11-25 13:19:21 +0100
committerParménides GV <parmegv@sdf.org>2014-11-25 13:19:21 +0100
commit576b0c26baf9b5b1418650a572604325ca7fb3af (patch)
tree8b2986d66ed4e6bdf5a3253c81f32cc5a8e53b99 /app/openssl/ssl/ssl_sess.c
parentbbf877a099112acbf34589b01503c3f5ee135dc0 (diff)
parent48cd0f2fa3094b5a6b7b07d6413d77bdbc9bbc20 (diff)
Merge branch 'develop'0.8.0
Diffstat (limited to 'app/openssl/ssl/ssl_sess.c')
-rw-r--r--app/openssl/ssl/ssl_sess.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/app/openssl/ssl/ssl_sess.c b/app/openssl/ssl/ssl_sess.c
index ec088404..7d170852 100644
--- a/app/openssl/ssl/ssl_sess.c
+++ b/app/openssl/ssl/ssl_sess.c
@@ -1144,6 +1144,17 @@ int (*SSL_CTX_get_client_cert_cb(SSL_CTX *ctx))(SSL * ssl, X509 ** x509 , EVP_PK
return ctx->client_cert_cb;
}
+void SSL_CTX_set_channel_id_cb(SSL_CTX *ctx,
+ void (*cb)(SSL *ssl, EVP_PKEY **pkey))
+ {
+ ctx->channel_id_cb=cb;
+ }
+
+void (*SSL_CTX_get_channel_id_cb(SSL_CTX *ctx))(SSL * ssl, EVP_PKEY **pkey)
+ {
+ return ctx->channel_id_cb;
+ }
+
#ifndef OPENSSL_NO_ENGINE
int SSL_CTX_set_client_cert_engine(SSL_CTX *ctx, ENGINE *e)
{