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 /apps/pkcs12.c | |
| parent | e4cf866322a4549c55153f9f135f9dadf4d3fc31 (diff) | |
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 'apps/pkcs12.c')
| -rw-r--r-- | apps/pkcs12.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 11930e9e16..3d566f3df2 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -484,7 +484,7 @@ int pkcs12_main(int argc, char **argv) goto export_end; } if (!twopass) - BUF_strlcpy(macpass, pass, sizeof macpass); + OPENSSL_strlcpy(macpass, pass, sizeof macpass); p12 = PKCS12_create(cpass, name, key, ucert, certs, key_pbe, cert_pbe, iter, -1, keytype); @@ -542,7 +542,7 @@ int pkcs12_main(int argc, char **argv) } if (!twopass) - BUF_strlcpy(macpass, pass, sizeof macpass); + OPENSSL_strlcpy(macpass, pass, sizeof macpass); if ((options & INFO) && p12->mac) BIO_printf(bio_err, "MAC Iteration %ld\n", |