diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2015-06-17 04:10:04 +0100 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2015-06-29 11:47:59 +0100 |
| commit | 57b272b01a9843c7e034feba7bfde5eaecc8bdb0 (patch) | |
| tree | db9acb32d2602d6ae96e9bba48b61aebebcec955 /ssl/tls_srp.c | |
| parent | 7f098cb4360a2677aab741ffc661964c501dd51e (diff) | |
Use single master secret generation function.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'ssl/tls_srp.c')
| -rw-r--r-- | ssl/tls_srp.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c index 6bd7845244..91b88cd11f 100644 --- a/ssl/tls_srp.c +++ b/ssl/tls_srp.c @@ -332,7 +332,7 @@ int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g, return 1; } -int SRP_generate_server_master_secret(SSL *s, unsigned char *master_key) +int srp_generate_server_master_secret(SSL *s) { BIGNUM *K = NULL, *u = NULL; int ret = -1, tmp_len = 0; @@ -350,17 +350,15 @@ int SRP_generate_server_master_secret(SSL *s, unsigned char *master_key) if ((tmp = OPENSSL_malloc(tmp_len)) == NULL) goto err; BN_bn2bin(K, tmp); - ret = s->method->ssl3_enc->generate_master_secret(s, master_key, tmp, - tmp_len); + ret = ssl_generate_master_secret(s, tmp, tmp_len, 1); err: - OPENSSL_clear_free(tmp, tmp_len); BN_clear_free(K); BN_clear_free(u); return ret; } /* client side */ -int SRP_generate_client_master_secret(SSL *s, unsigned char *master_key) +int srp_generate_client_master_secret(SSL *s) { BIGNUM *x = NULL, *u = NULL, *K = NULL; int ret = -1, tmp_len = 0; @@ -391,11 +389,8 @@ int SRP_generate_client_master_secret(SSL *s, unsigned char *master_key) if ((tmp = OPENSSL_malloc(tmp_len)) == NULL) goto err; BN_bn2bin(K, tmp); - ret = - s->method->ssl3_enc->generate_master_secret(s, master_key, tmp, - tmp_len); + ret = ssl_generate_master_secret(s, tmp, tmp_len, 1); err: - OPENSSL_clear_free(tmp, tmp_len); BN_clear_free(K); BN_clear_free(x); OPENSSL_clear_free(passwd, strlen(passwd)); |