summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/pem
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/pem
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/pem/pem_lib.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/pem/pem_lib.c b/src/lib/libcrypto/pem/pem_lib.c
index aa6a4c9387..93736455fa 100644
--- a/src/lib/libcrypto/pem/pem_lib.c
+++ b/src/lib/libcrypto/pem/pem_lib.c
@@ -137,9 +137,9 @@ void PEM_proc_type(char *buf, int type)
137 else 137 else
138 str="BAD-TYPE"; 138 str="BAD-TYPE";
139 139
140 BUF_strlcat(buf,"Proc-Type: 4,",PEM_BUFSIZE); 140 strlcat(buf,"Proc-Type: 4,",PEM_BUFSIZE);
141 BUF_strlcat(buf,str,PEM_BUFSIZE); 141 strlcat(buf,str,PEM_BUFSIZE);
142 BUF_strlcat(buf,"\n",PEM_BUFSIZE); 142 strlcat(buf,"\n",PEM_BUFSIZE);
143 } 143 }
144 144
145void PEM_dek_info(char *buf, const char *type, int len, char *str) 145void PEM_dek_info(char *buf, const char *type, int len, char *str)
@@ -148,9 +148,9 @@ void PEM_dek_info(char *buf, const char *type, int len, char *str)
148 long i; 148 long i;
149 int j; 149 int j;
150 150
151 BUF_strlcat(buf,"DEK-Info: ",PEM_BUFSIZE); 151 strlcat(buf,"DEK-Info: ",PEM_BUFSIZE);
152 BUF_strlcat(buf,type,PEM_BUFSIZE); 152 strlcat(buf,type,PEM_BUFSIZE);
153 BUF_strlcat(buf,",",PEM_BUFSIZE); 153 strlcat(buf,",",PEM_BUFSIZE);
154 j=strlen(buf); 154 j=strlen(buf);
155 if (j + (len * 2) + 1 > PEM_BUFSIZE) 155 if (j + (len * 2) + 1 > PEM_BUFSIZE)
156 return; 156 return;