diff options
author | deraadt <> | 2014-04-18 15:38:16 +0000 |
---|---|---|
committer | deraadt <> | 2014-04-18 15:38:16 +0000 |
commit | e5771c8113183d9900791e248265caa10e314025 (patch) | |
tree | 54fb231c476c85fa6c2f349d6f2ac9ee7528bbbb /src | |
parent | 8d7a155e827dd96b3fcf47a54551caa3e14fa961 (diff) | |
download | openbsd-e5771c8113183d9900791e248265caa10e314025.tar.gz openbsd-e5771c8113183d9900791e248265caa10e314025.tar.bz2 openbsd-e5771c8113183d9900791e248265caa10e314025.zip |
use the portable construct around asprintf; pointed out by halex
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/conf/conf_mod.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/apps/apps.c | 3 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/conf/conf_mod.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c index 436f239b12..2417086537 100644 --- a/src/lib/libcrypto/conf/conf_mod.c +++ b/src/lib/libcrypto/conf/conf_mod.c | |||
@@ -551,7 +551,8 @@ CONF_get1_default_config_file(void) | |||
551 | file = getenv("OPENSSL_CONF"); | 551 | file = getenv("OPENSSL_CONF"); |
552 | if (file) | 552 | if (file) |
553 | return BUF_strdup(file); | 553 | return BUF_strdup(file); |
554 | asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area()); | 554 | if (asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area()) == -1) |
555 | return (NULL); | ||
555 | return file; | 556 | return file; |
556 | } | 557 | } |
557 | 558 | ||
diff --git a/src/lib/libssl/src/apps/apps.c b/src/lib/libssl/src/apps/apps.c index cb9f8b0058..446bb4d17c 100644 --- a/src/lib/libssl/src/apps/apps.c +++ b/src/lib/libssl/src/apps/apps.c | |||
@@ -1326,7 +1326,8 @@ make_config_name() | |||
1326 | const char *t = X509_get_default_cert_area(); | 1326 | const char *t = X509_get_default_cert_area(); |
1327 | char *p; | 1327 | char *p; |
1328 | 1328 | ||
1329 | asprintf(&p, "%s/openssl.cnf", t); | 1329 | if (asprintf(&p, "%s/openssl.cnf", t) == -1) |
1330 | return NULL; | ||
1330 | return p; | 1331 | return p; |
1331 | } | 1332 | } |
1332 | 1333 | ||
diff --git a/src/lib/libssl/src/crypto/conf/conf_mod.c b/src/lib/libssl/src/crypto/conf/conf_mod.c index 436f239b12..2417086537 100644 --- a/src/lib/libssl/src/crypto/conf/conf_mod.c +++ b/src/lib/libssl/src/crypto/conf/conf_mod.c | |||
@@ -551,7 +551,8 @@ CONF_get1_default_config_file(void) | |||
551 | file = getenv("OPENSSL_CONF"); | 551 | file = getenv("OPENSSL_CONF"); |
552 | if (file) | 552 | if (file) |
553 | return BUF_strdup(file); | 553 | return BUF_strdup(file); |
554 | asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area()); | 554 | if (asprintf(&file, "%s/openssl.cnf", X509_get_default_cert_area()) == -1) |
555 | return (NULL); | ||
555 | return file; | 556 | return file; |
556 | } | 557 | } |
557 | 558 | ||