diff options
Diffstat (limited to 'src/lib/libcrypto/conf/conf_mod.c')
-rw-r--r-- | src/lib/libcrypto/conf/conf_mod.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/conf/conf_mod.c b/src/lib/libcrypto/conf/conf_mod.c index 5a747e8c84..d45adea851 100644 --- a/src/lib/libcrypto/conf/conf_mod.c +++ b/src/lib/libcrypto/conf/conf_mod.c | |||
@@ -232,7 +232,7 @@ static int module_run(const CONF *cnf, char *name, char *value, | |||
232 | { | 232 | { |
233 | char rcode[DECIMAL_SIZE(ret)+1]; | 233 | char rcode[DECIMAL_SIZE(ret)+1]; |
234 | CONFerr(CONF_F_CONF_MODULES_LOAD, CONF_R_MODULE_INITIALIZATION_ERROR); | 234 | CONFerr(CONF_F_CONF_MODULES_LOAD, CONF_R_MODULE_INITIALIZATION_ERROR); |
235 | snprintf(rcode, sizeof rcode, "%-8d", ret); | 235 | BIO_snprintf(rcode, sizeof rcode, "%-8d", ret); |
236 | ERR_add_error_data(6, "module=", name, ", value=", value, ", retcode=", rcode); | 236 | ERR_add_error_data(6, "module=", name, ", value=", value, ", retcode=", rcode); |
237 | } | 237 | } |
238 | } | 238 | } |
@@ -561,11 +561,11 @@ char *CONF_get1_default_config_file(void) | |||
561 | 561 | ||
562 | if (!file) | 562 | if (!file) |
563 | return NULL; | 563 | return NULL; |
564 | strlcpy(file,X509_get_default_cert_area(),len + 1); | 564 | BUF_strlcpy(file,X509_get_default_cert_area(),len + 1); |
565 | #ifndef OPENSSL_SYS_VMS | 565 | #ifndef OPENSSL_SYS_VMS |
566 | strlcat(file,"/",len + 1); | 566 | BUF_strlcat(file,"/",len + 1); |
567 | #endif | 567 | #endif |
568 | strlcat(file,OPENSSL_CONF,len + 1); | 568 | BUF_strlcat(file,OPENSSL_CONF,len + 1); |
569 | 569 | ||
570 | return file; | 570 | return file; |
571 | } | 571 | } |
@@ -576,12 +576,12 @@ char *CONF_get1_default_config_file(void) | |||
576 | * be used to parse comma separated lists for example. | 576 | * be used to parse comma separated lists for example. |
577 | */ | 577 | */ |
578 | 578 | ||
579 | int CONF_parse_list(const char *list, int sep, int nospc, | 579 | int CONF_parse_list(const char *list_, int sep, int nospc, |
580 | int (*list_cb)(const char *elem, int len, void *usr), void *arg) | 580 | int (*list_cb)(const char *elem, int len, void *usr), void *arg) |
581 | { | 581 | { |
582 | int ret; | 582 | int ret; |
583 | const char *lstart, *tmpend, *p; | 583 | const char *lstart, *tmpend, *p; |
584 | lstart = list; | 584 | lstart = list_; |
585 | 585 | ||
586 | for(;;) | 586 | for(;;) |
587 | { | 587 | { |