summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/libssl/src/ssl/ssl_lib.c31
-rw-r--r--src/lib/libssl/ssl_lib.c31
2 files changed, 0 insertions, 62 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index 1138ac5a69..55c6b4493a 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -1,6 +1,3 @@
1/*! \file ssl/ssl_lib.c
2 * \brief Version independent SSL functions.
3 */
4/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 1/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
5 * All rights reserved. 2 * All rights reserved.
6 * 3 *
@@ -2957,12 +2954,6 @@ SSL_want(const SSL *s)
2957 return (s->rwstate); 2954 return (s->rwstate);
2958} 2955}
2959 2956
2960/*!
2961 * \brief Set the callback for generating temporary RSA keys.
2962 * \param ctx the SSL context.
2963 * \param cb the callback
2964 */
2965
2966void 2957void
2967SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx, RSA *(*cb)(SSL *ssl, 2958SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx, RSA *(*cb)(SSL *ssl,
2968 int is_export, 2959 int is_export,
@@ -2979,28 +2970,6 @@ int keylength))
2979 SSL_callback_ctrl(ssl, SSL_CTRL_SET_TMP_RSA_CB,(void (*)(void))cb); 2970 SSL_callback_ctrl(ssl, SSL_CTRL_SET_TMP_RSA_CB,(void (*)(void))cb);
2980} 2971}
2981 2972
2982#ifdef DOXYGEN
2983/*!
2984 * \brief The RSA temporary key callback function.
2985 * \param ssl the SSL session.
2986 * \param is_export \c TRUE if the temp RSA key is for an export ciphersuite.
2987 * \param keylength if \c is_export is \c TRUE, then \c keylength is the size
2988 * of the required key in bits.
2989 * \return the temporary RSA key.
2990 * \sa SSL_CTX_set_tmp_rsa_callback, SSL_set_tmp_rsa_callback
2991 */
2992
2993RSA *
2994cb(SSL *ssl, int is_export, int keylength)
2995{}
2996#endif
2997
2998/*!
2999 * \brief Set the callback for generating temporary DH keys.
3000 * \param ctx the SSL context.
3001 * \param dh the callback
3002 */
3003
3004void 2973void
3005SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx, DH *(*dh)(SSL *ssl, int is_export, 2974SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx, DH *(*dh)(SSL *ssl, int is_export,
3006 int keylength)) 2975 int keylength))
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index 1138ac5a69..55c6b4493a 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1,6 +1,3 @@
1/*! \file ssl/ssl_lib.c
2 * \brief Version independent SSL functions.
3 */
4/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 1/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
5 * All rights reserved. 2 * All rights reserved.
6 * 3 *
@@ -2957,12 +2954,6 @@ SSL_want(const SSL *s)
2957 return (s->rwstate); 2954 return (s->rwstate);
2958} 2955}
2959 2956
2960/*!
2961 * \brief Set the callback for generating temporary RSA keys.
2962 * \param ctx the SSL context.
2963 * \param cb the callback
2964 */
2965
2966void 2957void
2967SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx, RSA *(*cb)(SSL *ssl, 2958SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx, RSA *(*cb)(SSL *ssl,
2968 int is_export, 2959 int is_export,
@@ -2979,28 +2970,6 @@ int keylength))
2979 SSL_callback_ctrl(ssl, SSL_CTRL_SET_TMP_RSA_CB,(void (*)(void))cb); 2970 SSL_callback_ctrl(ssl, SSL_CTRL_SET_TMP_RSA_CB,(void (*)(void))cb);
2980} 2971}
2981 2972
2982#ifdef DOXYGEN
2983/*!
2984 * \brief The RSA temporary key callback function.
2985 * \param ssl the SSL session.
2986 * \param is_export \c TRUE if the temp RSA key is for an export ciphersuite.
2987 * \param keylength if \c is_export is \c TRUE, then \c keylength is the size
2988 * of the required key in bits.
2989 * \return the temporary RSA key.
2990 * \sa SSL_CTX_set_tmp_rsa_callback, SSL_set_tmp_rsa_callback
2991 */
2992
2993RSA *
2994cb(SSL *ssl, int is_export, int keylength)
2995{}
2996#endif
2997
2998/*!
2999 * \brief Set the callback for generating temporary DH keys.
3000 * \param ctx the SSL context.
3001 * \param dh the callback
3002 */
3003
3004void 2973void
3005SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx, DH *(*dh)(SSL *ssl, int is_export, 2974SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx, DH *(*dh)(SSL *ssl, int is_export,
3006 int keylength)) 2975 int keylength))