diff options
author | beck <> | 2014-07-13 16:03:10 +0000 |
---|---|---|
committer | beck <> | 2014-07-13 16:03:10 +0000 |
commit | 6e4dfa23733fddf37830d1039cf31a2ffb86bdaf (patch) | |
tree | c2bbb8405534dcf838bc686b6748045284f3966b /src/lib/libcrypto/asn1 | |
parent | 143b41eb184dd7da7b6f74162483016fbb5faab0 (diff) | |
download | openbsd-6e4dfa23733fddf37830d1039cf31a2ffb86bdaf.tar.gz openbsd-6e4dfa23733fddf37830d1039cf31a2ffb86bdaf.tar.bz2 openbsd-6e4dfa23733fddf37830d1039cf31a2ffb86bdaf.zip |
The bell tolls for BUF_strdup - Start the migration to using
intrinsics. This is the easy ones, a few left to check one at
a time.
ok miod@ deraadt@
Diffstat (limited to 'src/lib/libcrypto/asn1')
-rw-r--r-- | src/lib/libcrypto/asn1/ameth_lib.c | 6 | ||||
-rw-r--r-- | src/lib/libcrypto/asn1/asn_mime.c | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/lib/libcrypto/asn1/ameth_lib.c b/src/lib/libcrypto/asn1/ameth_lib.c index e9f73cb3a6..e88496cc9d 100644 --- a/src/lib/libcrypto/asn1/ameth_lib.c +++ b/src/lib/libcrypto/asn1/ameth_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ameth_lib.c,v 1.13 2014/07/11 13:41:59 miod Exp $ */ | 1 | /* $OpenBSD: ameth_lib.c,v 1.14 2014/07/13 16:03:09 beck Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project 2006. | 3 | * project 2006. |
4 | */ | 4 | */ |
@@ -294,14 +294,14 @@ EVP_PKEY_asn1_new(int id, int flags, const char *pem_str, const char *info) | |||
294 | ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC; | 294 | ameth->pkey_flags = flags | ASN1_PKEY_DYNAMIC; |
295 | 295 | ||
296 | if (info) { | 296 | if (info) { |
297 | ameth->info = BUF_strdup(info); | 297 | ameth->info = strdup(info); |
298 | if (!ameth->info) | 298 | if (!ameth->info) |
299 | goto err; | 299 | goto err; |
300 | } else | 300 | } else |
301 | ameth->info = NULL; | 301 | ameth->info = NULL; |
302 | 302 | ||
303 | if (pem_str) { | 303 | if (pem_str) { |
304 | ameth->pem_str = BUF_strdup(pem_str); | 304 | ameth->pem_str = strdup(pem_str); |
305 | if (!ameth->pem_str) | 305 | if (!ameth->pem_str) |
306 | goto err; | 306 | goto err; |
307 | } else | 307 | } else |
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c index 994531837f..c153deca1e 100644 --- a/src/lib/libcrypto/asn1/asn_mime.c +++ b/src/lib/libcrypto/asn1/asn_mime.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: asn_mime.c,v 1.21 2014/07/11 13:41:59 miod Exp $ */ | 1 | /* $OpenBSD: asn_mime.c,v 1.22 2014/07/13 16:03:09 beck Exp $ */ |
2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
3 | * project. | 3 | * project. |
4 | */ | 4 | */ |
@@ -833,13 +833,13 @@ mime_hdr_new(char *name, char *value) | |||
833 | char *tmpname = NULL, *tmpval = NULL, *p; | 833 | char *tmpname = NULL, *tmpval = NULL, *p; |
834 | 834 | ||
835 | if (name) { | 835 | if (name) { |
836 | if (!(tmpname = BUF_strdup(name))) | 836 | if (!(tmpname = strdup(name))) |
837 | goto err; | 837 | goto err; |
838 | for (p = tmpname; *p; p++) | 838 | for (p = tmpname; *p; p++) |
839 | *p = tolower((unsigned char)*p); | 839 | *p = tolower((unsigned char)*p); |
840 | } | 840 | } |
841 | if (value) { | 841 | if (value) { |
842 | if (!(tmpval = BUF_strdup(value))) | 842 | if (!(tmpval = strdup(value))) |
843 | goto err; | 843 | goto err; |
844 | for (p = tmpval; *p; p++) | 844 | for (p = tmpval; *p; p++) |
845 | *p = tolower((unsigned char)*p); | 845 | *p = tolower((unsigned char)*p); |
@@ -867,14 +867,14 @@ mime_hdr_addparam(MIME_HEADER *mhdr, char *name, char *value) | |||
867 | MIME_PARAM *mparam; | 867 | MIME_PARAM *mparam; |
868 | 868 | ||
869 | if (name) { | 869 | if (name) { |
870 | tmpname = BUF_strdup(name); | 870 | tmpname = strdup(name); |
871 | if (!tmpname) | 871 | if (!tmpname) |
872 | goto err; | 872 | goto err; |
873 | for (p = tmpname; *p; p++) | 873 | for (p = tmpname; *p; p++) |
874 | *p = tolower((unsigned char)*p); | 874 | *p = tolower((unsigned char)*p); |
875 | } | 875 | } |
876 | if (value) { | 876 | if (value) { |
877 | tmpval = BUF_strdup(value); | 877 | tmpval = strdup(value); |
878 | if (!tmpval) | 878 | if (!tmpval) |
879 | goto err; | 879 | goto err; |
880 | } | 880 | } |