Commit 766e0cb7 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

SRP fixes from HEAD which weren't in 1.0.1-stable.

parent 6a6b0c8b

ssl/tls_srp.c

+12 −12
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ int SSL_CTX_set_srp_strength(SSL_CTX *ctx, int strength) 
int SSL_CTX_set_srp_verify_param_callback(SSL_CTX *ctx, int (*cb)(SSL *,void *))

	{

	return tls1_ctx_callback_ctrl(ctx,SSL_CTRL_SET_SRP_VERIFY_PARAM_CB,

				      (void (*)())cb);

				      (void (*)(void))cb);

	}



int SSL_CTX_set_srp_cb_arg(SSL_CTX *ctx, void *arg)
@@ -508,13 +508,13 @@ int SSL_CTX_set_srp_username_callback(SSL_CTX *ctx, 
				      int (*cb)(SSL *,int *,void *))

	{

	return tls1_ctx_callback_ctrl(ctx,SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB,

				      (void (*)())cb);

				      (void (*)(void))cb);

	}



int SSL_CTX_set_srp_client_pwd_callback(SSL_CTX *ctx, char *(*cb)(SSL *,void *))

	{

	return tls1_ctx_callback_ctrl(ctx,SSL_CTRL_SET_SRP_GIVE_CLIENT_PWD_CB,

				      (void (*)())cb);

				      (void (*)(void))cb);

	}



int SSL_CTX_set_srp_missing_srp_username_callback(SSL_CTX *ctx,
@@ -522,6 +522,6 @@ int SSL_CTX_set_srp_missing_srp_username_callback(SSL_CTX *ctx, 
	{

	return tls1_ctx_callback_ctrl(ctx,

			    SSL_CTRL_SET_TLS_EXT_SRP_MISSING_CLIENT_USERNAME_CB,

				      (void (*)())cb);

				      (void (*)(void))cb);

	}

#endif