replace macros with functions

Submitted by: Tracy Camp <tracyx.e.camp@intel.com>

1 files changed, 32 insertions, 2 deletions

diff --git a/ssl/ssl_lib.c b/ssl/ssl_lib.c
index 44f82eb3ee..1cc3ac9cb6 100644
--- a/ssl/ssl_lib.c
+++ b/ssl/ssl_lib.c
@@ -2550,14 +2550,14 @@ int SSL_CTX_load_verify_locations(SSL_CTX *ctx, const char *CAfile,
 #endif
 
 void SSL_set_info_callback(SSL *ssl,
-			   void (*cb)(const SSL *ssl,int type,int val))
+	void (*cb)(const SSL *ssl,int type,int val))
 	{
 	ssl->info_callback=cb;
 	}
 
 /* One compiler (Diab DCC) doesn't like argument names in returned
    function pointer.  */
-void (*SSL_get_info_callback(const SSL *ssl))(const SSL * /*ssl*/,int /*type*/,int /*val*/)
+void (*SSL_get_info_callback(const SSL *ssl))(const SSL * /*ssl*/,int /*type*/,int /*val*/) 
 	{
 	return ssl->info_callback;
 	}
@@ -2764,6 +2764,36 @@ const char *SSL_get_psk_identity(const SSL *s)
 		return NULL;
 	return(s->session->psk_identity);
 	}
+
+void SSL_set_psk_client_callback(SSL *s, 
+	unsigned int (*cb)(SSL *ssl, const char *hint,
+                char *identity, unsigned int max_identity_len, unsigned char *psk,
+                unsigned int max_psk_len))
+	{
+	s->psk_client_callback = cb;	
+	}
+
+void SSL_CTX_set_psk_client_callback(SSL_CTX *ctx,
+	unsigned int (*cb)(SSL *ssl, const char *hint,
+                char *identity, unsigned int max_identity_len, unsigned char *psk,
+                unsigned int max_psk_len))
+	{
+	ctx->psk_client_callback = cb;	
+	}
+
+void SSL_set_psk_server_callback(SSL *s, 
+	unsigned int (*cb)(SSL *ssl, const char *identity,
+                unsigned char *psk, unsigned int max_psk_len))
+	{
+	s->psk_server_callback = cb;	
+	}
+
+void SSL_CTX_set_psk_server_callback(SSL_CTX *ctx,
+	unsigned int (*cb)(SSL *ssl, const char *identity,
+                unsigned char *psk, unsigned int max_psk_len))
+	{
+	ctx->psk_server_callback = cb;	
+	}
 #endif
 
 void SSL_CTX_set_msg_callback(SSL_CTX *ctx, void (*cb)(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg))