diff options
| author |   beck <beck@openbsd.org> | 2014-04-17 13:37:48 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2014-04-17 13:37:48 +0000 |
| commit | 6f3a6cb14ff86acbae89a0395ba3cdc01e85fa54 (patch) | |
| tree | e7ca531f41f3403bf7f04411c40317e859a02460 /lib/libssl/src/ssl/tls_srp.c | |
| parent | Revert unintended whitespace changes. (diff) | |
| download | wireguard-openbsd-6f3a6cb14ff86acbae89a0395ba3cdc01e85fa54.tar.xz wireguard-openbsd-6f3a6cb14ff86acbae89a0395ba3cdc01e85fa54.zip | |
Change library to use intrinsic memory allocation functions instead of
OPENSSL_foo wrappers. This changes:
OPENSSL_malloc->malloc
OPENSSL_free->free
OPENSSL_relloc->realloc
OPENSSL_freeFunc->free
Diffstat (limited to 'lib/libssl/src/ssl/tls_srp.c')
| -rw-r--r-- | lib/libssl/src/ssl/tls_srp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/libssl/src/ssl/tls_srp.c b/lib/libssl/src/ssl/tls_srp.c index 25ab73af9db..a3acb6fd14b 100644 --- a/lib/libssl/src/ssl/tls_srp.c +++ b/lib/libssl/src/ssl/tls_srp.c @@ -67,7 +67,7 @@ int SSL_CTX_SRP_CTX_free(struct ssl_ctx_st *ctx) { if (ctx == NULL) return 0; - OPENSSL_free(ctx->srp_ctx.login); + free(ctx->srp_ctx.login); BN_free(ctx->srp_ctx.N); BN_free(ctx->srp_ctx.g); BN_free(ctx->srp_ctx.s); @@ -99,7 +99,7 @@ int SSL_SRP_CTX_free(struct ssl_st *s) { if (s == NULL) return 0; - OPENSSL_free(s->srp_ctx.login); + free(s->srp_ctx.login); BN_free(s->srp_ctx.N); BN_free(s->srp_ctx.g); BN_free(s->srp_ctx.s); @@ -181,7 +181,7 @@ SSL_SRP_CTX_init(struct ssl_st *s) { return (1); err: - OPENSSL_free(s->srp_ctx.login); + free(s->srp_ctx.login); BN_free(s->srp_ctx.N); BN_free(s->srp_ctx.g); BN_free(s->srp_ctx.s); @@ -338,14 +338,14 @@ SRP_generate_server_master_secret(SSL *s, unsigned char *master_key) goto err; tmp_len = BN_num_bytes(K); - if ((tmp = OPENSSL_malloc(tmp_len)) == NULL) + if ((tmp = malloc(tmp_len)) == NULL) goto err; BN_bn2bin(K, tmp); ret = s->method->ssl3_enc->generate_master_secret(s, master_key, tmp, tmp_len); err: if (tmp) { OPENSSL_cleanse(tmp, tmp_len); - OPENSSL_free(tmp); + free(tmp); } BN_clear_free(K); BN_clear_free(u); @@ -379,20 +379,20 @@ SRP_generate_client_master_secret(SSL *s, unsigned char *master_key) goto err; tmp_len = BN_num_bytes(K); - if ((tmp = OPENSSL_malloc(tmp_len)) == NULL) goto err; + if ((tmp = malloc(tmp_len)) == NULL) goto err; BN_bn2bin(K, tmp); ret = s->method->ssl3_enc->generate_master_secret(s, master_key, tmp, tmp_len); err: if (tmp) { OPENSSL_cleanse(tmp, tmp_len); - OPENSSL_free(tmp); + free(tmp); } BN_clear_free(K); BN_clear_free(x); if (passwd) { OPENSSL_cleanse(passwd, strlen(passwd)); - OPENSSL_free(passwd); + free(passwd); } BN_clear_free(u); return ret; |