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

This commit is contained in:
Dr. Stephen Henson 2011-05-12 13:46:40 +00:00
parent 6a6b0c8b51
commit 766e0cb7d1

View File

@ -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 *)) 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, 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) 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 *)) int (*cb)(SSL *,int *,void *))
{ {
return tls1_ctx_callback_ctrl(ctx,SSL_CTRL_SET_TLS_EXT_SRP_USERNAME_CB, 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 *)) 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, 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, 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, return tls1_ctx_callback_ctrl(ctx,
SSL_CTRL_SET_TLS_EXT_SRP_MISSING_CLIENT_USERNAME_CB, SSL_CTRL_SET_TLS_EXT_SRP_MISSING_CLIENT_USERNAME_CB,
(void (*)())cb); (void (*)(void))cb);
} }
#endif #endif