diff options
| author | Rich Salz <rsalz@akamai.com> | 2015-12-16 16:12:24 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2015-12-16 16:14:49 -0500 |
| commit | 7644a9aef8932ed4d1c3f25ed776c997702982be (patch) | |
| tree | d8f1e7fca20ad12683a1e2e52c92b6999ada23a6 /crypto/x509 | |
| parent | e4cf866322a4549c55153f9f135f9dadf4d3fc31 (diff) | |
| download | openssl-7644a9aef8932ed4d1c3f25ed776c997702982be.tar.gz | |
Rename some BUF_xxx to OPENSSL_xxx
Rename BUF_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
to OPENSSL_{strdup,strlcat,strlcpy,memdup,strndup,strnlen}
Add #define's for the old names.
Add CRYPTO_{memdup,strndup}, called by OPENSSL_{memdup,strndup} macros.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'crypto/x509')
| -rw-r--r-- | crypto/x509/x509_trs.c | 2 | ||||
| -rw-r--r-- | crypto/x509/x509_vpm.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/crypto/x509/x509_trs.c b/crypto/x509/x509_trs.c index 6e3616e2f2..27ee47590d 100644 --- a/crypto/x509/x509_trs.c +++ b/crypto/x509/x509_trs.c @@ -201,7 +201,7 @@ int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int), if (trtmp->flags & X509_TRUST_DYNAMIC_NAME) OPENSSL_free(trtmp->name); /* dup supplied name */ - if ((trtmp->name = BUF_strdup(name)) == NULL) { + if ((trtmp->name = OPENSSL_strdup(name)) == NULL) { X509err(X509_F_X509_TRUST_ADD, ERR_R_MALLOC_FAILURE); return 0; } diff --git a/crypto/x509/x509_vpm.c b/crypto/x509/x509_vpm.c index 0188114b0f..2a15f82ea1 100644 --- a/crypto/x509/x509_vpm.c +++ b/crypto/x509/x509_vpm.c @@ -106,7 +106,7 @@ static int int_x509_param_set_hosts(X509_VERIFY_PARAM *vpm, int mode, if (name == NULL || namelen == 0) return 1; - copy = BUF_strndup(name, namelen); + copy = OPENSSL_strndup(name, namelen); if (copy == NULL) return 0; @@ -308,10 +308,10 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, void *tmp; if (src) { if (srclen == 0) { - tmp = BUF_strdup(src); + tmp = OPENSSL_strdup(src); srclen = strlen(src); } else - tmp = BUF_memdup(src, srclen); + tmp = OPENSSL_memdup(src, srclen); if (!tmp) return 0; } else { @@ -328,7 +328,7 @@ static int int_x509_param_set1(char **pdest, size_t *pdestlen, int X509_VERIFY_PARAM_set1_name(X509_VERIFY_PARAM *param, const char *name) { OPENSSL_free(param->name); - param->name = BUF_strdup(name); + param->name = OPENSSL_strdup(name); if (param->name) return 1; return 0; |