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 /crypto | |
| 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 'crypto')
| -rw-r--r-- | crypto/bio/bss_acpt.c | 2 | ||||
| -rw-r--r-- | crypto/bio/bss_conn.c | 2 | ||||
| -rw-r--r-- | crypto/ct/ct_oct.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c index 3c2b279b3f..3d2937594e 100644 --- a/crypto/bio/bss_acpt.c +++ b/crypto/bio/bss_acpt.c @@ -432,7 +432,7 @@ static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr) b->init = 1; } else if (num == 1) { OPENSSL_free(data->param_serv); - data->param_serv = BUF_strdup(ptr); + data->param_serv = OPENSSL_strdup(ptr); b->init = 1; } else if (num == 2) { data->bind_mode |= BIO_SOCK_NONBLOCK; diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index afcf436749..3c2060cc10 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -411,7 +411,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) OPENSSL_free(hold_service); } else if (num == 1) { OPENSSL_free(data->param_service); - data->param_service = BUF_strdup(ptr); + data->param_service = OPENSSL_strdup(ptr); } else if (num == 2) { const BIO_ADDR *addr = (const BIO_ADDR *)ptr; if (ret) { diff --git a/crypto/ct/ct_oct.c b/crypto/ct/ct_oct.c index cdab02fdf8..bd8d1bb1df 100644 --- a/crypto/ct/ct_oct.c +++ b/crypto/ct/ct_oct.c @@ -101,7 +101,7 @@ SCT *o2i_SCT(SCT **psct, const unsigned char **in, size_t len) } len -= 43; p++; - sct->log_id = BUF_memdup(p, CT_V1_HASHLEN); + sct->log_id = OPENSSL_memdup(p, CT_V1_HASHLEN); if (sct->log_id == NULL) goto err; sct->log_id_len = CT_V1_HASHLEN; @@ -115,7 +115,7 @@ SCT *o2i_SCT(SCT **psct, const unsigned char **in, size_t len) goto err; } if (len2 > 0) { - sct->ext = BUF_memdup(p, len2); + sct->ext = OPENSSL_memdup(p, len2); if (sct->ext == NULL) goto err; } @@ -132,7 +132,7 @@ SCT *o2i_SCT(SCT **psct, const unsigned char **in, size_t len) *in = p + len; } else { /* If not V1 just cache encoding */ - sct->sct = BUF_memdup(p, len); + sct->sct = OPENSSL_memdup(p, len); if (sct->sct == NULL) goto err; sct->sct_len = len; |