Make the world a safer place (if people object to this kind of change, speak up
authorBen Laurie <ben@openssl.org>
Wed, 6 Jan 1999 22:53:34 +0000 (22:53 +0000)
committerBen Laurie <ben@openssl.org>
Wed, 6 Jan 1999 22:53:34 +0000 (22:53 +0000)
soon - I intend to do a lot of it!).

CHANGES
ssl/ssl.h
ssl/ssl_lib.c

diff --git a/CHANGES b/CHANGES
index d1e7e86..412d913 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,10 @@
 
  Changes between 0.9.1c and 0.9.2
 
+  *) Add prototype for temp key callback functions
+     SSL_CTX_set_tmp_{rsa,dh}_callback().
+     [Ben Laurie]
+
   *) Make DH_free() tolerate being passed a NULL pointer (like RSA_free() and
      DSA_free()). Make X509_PUBKEY_set() check for errors in d2i_PublicKey().
      [Steve Henson]
index a308481..3238f5e 100644 (file)
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -746,10 +746,9 @@ typedef struct ssl_st
  * RSA *tmp_rsa_cb(SSL *ssl,int export)
  * DH *tmp_dh_cb(SSL *ssl,int export)
  */
-#define SSL_CTX_set_tmp_rsa_callback(ctx,cb) \
-       SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb)
-#define SSL_CTX_set_tmp_dh_callback(ctx,dh) \
-       SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh)
+void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,
+                                 RSA *(*cb)(SSL *ssl,int export));
+void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,DH *(*dh)(SSL *ssl,int export));
 
 #define SSL_CTX_add_extra_chain_cert(ctx,x509) \
        SSL_CTX_ctrl(ctx,SSL_CTRL_EXTRA_CHAIN_CERT,0,(char *)x509)
index a4bbe53..e562330 100644 (file)
@@ -1743,6 +1743,12 @@ SSL *s;
        return(1);
        }
 
+void SSL_CTX_set_tmp_rsa_callback(SSL_CTX *ctx,RSA *(*cb)(SSL *ssl,int export))
+    { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_RSA_CB,0,(char *)cb); }
+
+void SSL_CTX_set_tmp_dh_callback(SSL_CTX *ctx,DH *(*dh)(SSL *ssl,int export))
+    { SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TMP_DH_CB,0,(char *)dh); }
+
 #if defined(_WINDLL) && defined(WIN16)
 #include "../crypto/bio/bss_file.c"
 #endif