diff options
author | beck <> | 2014-04-19 00:41:38 +0000 |
---|---|---|
committer | beck <> | 2014-04-19 00:41:38 +0000 |
commit | f15b58ab9c9f635ba829753251c22b3da4683b00 (patch) | |
tree | 174c4c233f06a12ea563fd4e4c48bc26d4bdede3 /src/lib/libcrypto/objects/obj_dat.c | |
parent | 4855ea84e69fe2edcf4d523233d15c950bd77e4d (diff) | |
download | openbsd-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/objects/obj_dat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libcrypto/objects/obj_dat.c b/src/lib/libcrypto/objects/obj_dat.c index cf4db7c6b5..b3388b117d 100644 --- a/src/lib/libcrypto/objects/obj_dat.c +++ b/src/lib/libcrypto/objects/obj_dat.c | |||
@@ -486,7 +486,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name) | |||
486 | if (s) | 486 | if (s) |
487 | { | 487 | { |
488 | if (buf) | 488 | if (buf) |
489 | BUF_strlcpy(buf,s,buf_len); | 489 | strlcpy(buf,s,buf_len); |
490 | n=strlen(s); | 490 | n=strlen(s); |
491 | return n; | 491 | return n; |
492 | } | 492 | } |
@@ -576,7 +576,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name) | |||
576 | *buf++ = '.'; | 576 | *buf++ = '.'; |
577 | buf_len--; | 577 | buf_len--; |
578 | } | 578 | } |
579 | BUF_strlcpy(buf,bndec,buf_len); | 579 | strlcpy(buf,bndec,buf_len); |
580 | if (i > buf_len) | 580 | if (i > buf_len) |
581 | { | 581 | { |
582 | buf += buf_len; | 582 | buf += buf_len; |
@@ -598,7 +598,7 @@ int OBJ_obj2txt(char *buf, int buf_len, const ASN1_OBJECT *a, int no_name) | |||
598 | i=strlen(tbuf); | 598 | i=strlen(tbuf); |
599 | if (buf && (buf_len > 0)) | 599 | if (buf && (buf_len > 0)) |
600 | { | 600 | { |
601 | BUF_strlcpy(buf,tbuf,buf_len); | 601 | strlcpy(buf,tbuf,buf_len); |
602 | if (i > buf_len) | 602 | if (i > buf_len) |
603 | { | 603 | { |
604 | buf += buf_len; | 604 | buf += buf_len; |