diff options
| author | Rich Salz <rsalz@akamai.com> | 2019-10-17 15:45:34 -0400 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-10-17 23:19:59 +0200 |
| commit | 3d48457478bd61030c370e4090c1462fc4453d81 (patch) | |
| tree | cf36ad0667881411cb5b02f44411c03e510e12f2 /ssl | |
| parent | 8c77d45adab101f10b323de3d59fb47b8f8d3a93 (diff) | |
Replace BUF_ string function calls with OPENSSL_ ones
Deprecate the BUF_ string macros
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10207)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/s3_lib.c | 2 | ||||
| -rw-r--r-- | ssl/tls_srp.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index a329915ac9..15aeae365e 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3885,7 +3885,7 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg) srp_password_from_info_cb; if (ctx->srp_ctx.info != NULL) OPENSSL_free(ctx->srp_ctx.info); - if ((ctx->srp_ctx.info = BUF_strdup((char *)parg)) == NULL) { + if ((ctx->srp_ctx.info = OPENSSL_strdup((char *)parg)) == NULL) { SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_INTERNAL_ERROR); return 0; } diff --git a/ssl/tls_srp.c b/ssl/tls_srp.c index d252db33fb..6888bcd4d4 100644 --- a/ssl/tls_srp.c +++ b/ssl/tls_srp.c @@ -104,7 +104,7 @@ int SSL_SRP_CTX_init(struct ssl_st *s) goto err; } if ((ctx->srp_ctx.info != NULL) && - ((s->srp_ctx.info = BUF_strdup(ctx->srp_ctx.info)) == NULL)) { + ((s->srp_ctx.info = OPENSSL_strdup(ctx->srp_ctx.info)) == NULL)) { SSLerr(SSL_F_SSL_SRP_CTX_INIT, ERR_R_INTERNAL_ERROR); goto err; } @@ -235,7 +235,7 @@ int SSL_set_srp_server_param(SSL *s, const BIGNUM *N, const BIGNUM *g, if (info != NULL) { if (s->srp_ctx.info) OPENSSL_free(s->srp_ctx.info); - if ((s->srp_ctx.info = BUF_strdup(info)) == NULL) + if ((s->srp_ctx.info = OPENSSL_strdup(info)) == NULL) return -1; } |