summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ui/ui_lib.c
diff options
context:
space:
mode:
authorbeck <>2014-04-19 00:41:38 +0000
committerbeck <>2014-04-19 00:41:38 +0000
commitf15b58ab9c9f635ba829753251c22b3da4683b00 (patch)
tree174c4c233f06a12ea563fd4e4c48bc26d4bdede3 /src/lib/libcrypto/ui/ui_lib.c
parent4855ea84e69fe2edcf4d523233d15c950bd77e4d (diff)
downloadopenbsd-f15b58ab9c9f635ba829753251c22b3da4683b00.tar.gz
openbsd-f15b58ab9c9f635ba829753251c22b3da4683b00.tar.bz2
openbsd-f15b58ab9c9f635ba829753251c22b3da4683b00.zip
use intrinsic strlcpy and strlcat everywhere so we only have one set of
funcitons to check for incorrect use. keep BUF_strlcpy and BUF_strlcat for API comptibility only. ok tedu@
Diffstat (limited to '')
-rw-r--r--src/lib/libcrypto/ui/ui_lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/ui/ui_lib.c b/src/lib/libcrypto/ui/ui_lib.c
index fc03d9b7d4..58e4c5d722 100644
--- a/src/lib/libcrypto/ui/ui_lib.c
+++ b/src/lib/libcrypto/ui/ui_lib.c
@@ -409,13 +409,13 @@ UI_construct_prompt(UI *ui, const char *object_desc, const char *object_name)
409 len += sizeof(prompt3) - 1; 409 len += sizeof(prompt3) - 1;
410 410
411 prompt = (char *)malloc(len + 1); 411 prompt = (char *)malloc(len + 1);
412 BUF_strlcpy(prompt, prompt1, len + 1); 412 strlcpy(prompt, prompt1, len + 1);
413 BUF_strlcat(prompt, object_desc, len + 1); 413 strlcat(prompt, object_desc, len + 1);
414 if (object_name) { 414 if (object_name) {
415 BUF_strlcat(prompt, prompt2, len + 1); 415 strlcat(prompt, prompt2, len + 1);
416 BUF_strlcat(prompt, object_name, len + 1); 416 strlcat(prompt, object_name, len + 1);
417 } 417 }
418 BUF_strlcat(prompt, prompt3, len + 1); 418 strlcat(prompt, prompt3, len + 1);
419 } 419 }
420 return prompt; 420 return prompt;
421} 421}
@@ -869,7 +869,7 @@ UI_set_result(UI *ui, UI_STRING *uis, const char *result)
869 UIerr(UI_F_UI_SET_RESULT, UI_R_NO_RESULT_BUFFER); 869 UIerr(UI_F_UI_SET_RESULT, UI_R_NO_RESULT_BUFFER);
870 return -1; 870 return -1;
871 } 871 }
872 BUF_strlcpy(uis->result_buf, result, 872 strlcpy(uis->result_buf, result,
873 uis->_.string_data.result_maxsize + 1); 873 uis->_.string_data.result_maxsize + 1);
874 break; 874 break;
875 case UIT_BOOLEAN: 875 case UIT_BOOLEAN: