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@

7 files changed, 26 insertions, 26 deletions

diff --git a/lib/libssl/src/apps/apps.c b/lib/libssl/src/apps/apps.c
index 446bb4d17ce..4a8be9993df 100644
--- a/lib/libssl/src/apps/apps.c
+++ b/lib/libssl/src/apps/apps.c
@@ -198,7 +198,7 @@ program_name(char *in, char *out, int size)
 		p++;
 	else
 		p = in;
-	BUF_strlcpy(out, p, size);
+	strlcpy(out, p, size);
 }
 
 int
@@ -1447,7 +1447,7 @@ save_serial(char *serialfile, char *suffix, BIGNUM * serial,
 		goto err;
 	}
 	if (suffix == NULL)
-		BUF_strlcpy(buf[0], serialfile, BSIZE);
+		strlcpy(buf[0], serialfile, BSIZE);
 	else
 		(void) snprintf(buf[0], sizeof buf[0], "%s.%s", serialfile, suffix);
 #ifdef RL_DEBUG
diff --git a/lib/libssl/src/apps/ca.c b/lib/libssl/src/apps/ca.c
index c582549b15b..3f2d10671c0 100644
--- a/lib/libssl/src/apps/ca.c
+++ b/lib/libssl/src/apps/ca.c
@@ -1136,7 +1136,7 @@ ca_main(int argc, char **argv)
 			}
 			strlcpy(buf[2], outdir, sizeof(buf[2]));
 
-			BUF_strlcat(buf[2], "/", sizeof(buf[2]));
+			strlcat(buf[2], "/", sizeof(buf[2]));
 
 			n = (char *) &(buf[2][strlen(buf[2])]);
 			if (j > 0) {
@@ -1955,7 +1955,7 @@ do_body(X509 ** xret, EVP_PKEY * pkey, X509 * x509, const EVP_MD * dgst,
 		BIO_printf(bio_err, "Memory allocation failure\n");
 		goto err;
 	}
-	BUF_strlcpy(row[DB_file], "unknown", 8);
+	strlcpy(row[DB_file], "unknown", 8);
 	row[DB_type][0] = 'V';
 	row[DB_type][1] = '\0';
 
@@ -2211,7 +2211,7 @@ do_revoke(X509 * x509, CA_DB * db, int type, char *value)
 			BIO_printf(bio_err, "Memory allocation failure\n");
 			goto err;
 		}
-		BUF_strlcpy(row[DB_file], "unknown", 8);
+		strlcpy(row[DB_file], "unknown", 8);
 		row[DB_type][0] = 'V';
 		row[DB_type][1] = '\0';
 
@@ -2497,14 +2497,14 @@ make_revocation_str(int rev_type, char *rev_arg)
 	if (!str)
 		return NULL;
 
-	BUF_strlcpy(str, (char *) revtm->data, i);
+	strlcpy(str, (char *) revtm->data, i);
 	if (reason) {
-		BUF_strlcat(str, ",", i);
-		BUF_strlcat(str, reason, i);
+		strlcat(str, ",", i);
+		strlcat(str, reason, i);
 	}
 	if (other) {
-		BUF_strlcat(str, ",", i);
-		BUF_strlcat(str, other, i);
+		strlcat(str, ",", i);
+		strlcat(str, other, i);
 	}
 	ASN1_UTCTIME_free(revtm);
 	return str;
diff --git a/lib/libssl/src/apps/engine.c b/lib/libssl/src/apps/engine.c
index 5ed33d0d399..7898c96f23d 100644
--- a/lib/libssl/src/apps/engine.c
+++ b/lib/libssl/src/apps/engine.c
@@ -119,8 +119,8 @@ append_buf(char **buf, const char *s, int *size, int step)
 		return 0;
 
 	if (**buf != '\0')
-		BUF_strlcat(*buf, ", ", *size);
-	BUF_strlcat(*buf, s, *size);
+		strlcat(*buf, ", ", *size);
+	strlcat(*buf, s, *size);
 
 	return 1;
 }
diff --git a/lib/libssl/src/apps/pkcs12.c b/lib/libssl/src/apps/pkcs12.c
index 933fded99ad..44ee6986054 100644
--- a/lib/libssl/src/apps/pkcs12.c
+++ b/lib/libssl/src/apps/pkcs12.c
@@ -592,7 +592,7 @@ pkcs12_main(int argc, char **argv)
 			goto export_end;
 		}
 		if (!twopass)
-			BUF_strlcpy(macpass, pass, sizeof macpass);
+			strlcpy(macpass, pass, sizeof macpass);
 
 #ifdef CRYPTO_MDEBUG
 		CRYPTO_pop_info();
@@ -661,7 +661,7 @@ export_end:
 #endif
 
 	if (!twopass)
-		BUF_strlcpy(macpass, pass, sizeof macpass);
+		strlcpy(macpass, pass, sizeof macpass);
 
 	if ((options & INFO) && p12->mac)
 		BIO_printf(bio_err, "MAC Iteration %ld\n", p12->mac->iter ? ASN1_INTEGER_get(p12->mac->iter) : 1);
diff --git a/lib/libssl/src/apps/req.c b/lib/libssl/src/apps/req.c
index 6f46e82ecdc..1ed8c84a8d6 100644
--- a/lib/libssl/src/apps/req.c
+++ b/lib/libssl/src/apps/req.c
@@ -1227,8 +1227,8 @@ start:
 		BIO_printf(bio_err, "%s [%s]:", text, def);
 	(void) BIO_flush(bio_err);
 	if (value != NULL) {
-		BUF_strlcpy(buf, value, sizeof buf);
-		BUF_strlcat(buf, "\n", sizeof buf);
+		strlcpy(buf, value, sizeof buf);
+		strlcat(buf, "\n", sizeof buf);
 		BIO_printf(bio_err, "%s\n", value);
 	} else {
 		buf[0] = '\0';
@@ -1246,8 +1246,8 @@ start:
 	else if (buf[0] == '\n') {
 		if ((def == NULL) || (def[0] == '\0'))
 			return (1);
-		BUF_strlcpy(buf, def, sizeof buf);
-		BUF_strlcat(buf, "\n", sizeof buf);
+		strlcpy(buf, def, sizeof buf);
+		strlcat(buf, "\n", sizeof buf);
 	} else if ((buf[0] == '.') && (buf[1] == '\n'))
 		return (1);
 
@@ -1280,8 +1280,8 @@ start:
 		BIO_printf(bio_err, "%s [%s]:", text, def);
 	(void) BIO_flush(bio_err);
 	if (value != NULL) {
-		BUF_strlcpy(buf, value, sizeof buf);
-		BUF_strlcat(buf, "\n", sizeof buf);
+		strlcpy(buf, value, sizeof buf);
+		strlcat(buf, "\n", sizeof buf);
 		BIO_printf(bio_err, "%s\n", value);
 	} else {
 		buf[0] = '\0';
@@ -1299,8 +1299,8 @@ start:
 	else if (buf[0] == '\n') {
 		if ((def == NULL) || (def[0] == '\0'))
 			return (1);
-		BUF_strlcpy(buf, def, sizeof buf);
-		BUF_strlcat(buf, "\n", sizeof buf);
+		strlcpy(buf, def, sizeof buf);
+		strlcat(buf, "\n", sizeof buf);
 	} else if ((buf[0] == '.') && (buf[1] == '\n'))
 		return (1);
 
diff --git a/lib/libssl/src/apps/s_socket.c b/lib/libssl/src/apps/s_socket.c
index b801cf77960..57015ed8ffc 100644
--- a/lib/libssl/src/apps/s_socket.c
+++ b/lib/libssl/src/apps/s_socket.c
@@ -306,7 +306,7 @@ redoit:
 			perror("malloc");
 			return (0);
 		}
-		BUF_strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1);
+		strlcpy(*host, h1->h_name, strlen(h1->h_name) + 1);
 
 		h2 = GetHostByName(*host);
 		if (h2 == NULL) {
diff --git a/lib/libssl/src/apps/x509.c b/lib/libssl/src/apps/x509.c
index 5841a1b80d0..18b9e71586d 100644
--- a/lib/libssl/src/apps/x509.c
+++ b/lib/libssl/src/apps/x509.c
@@ -971,15 +971,15 @@ x509_load_serial(char *CAfile, char *serialfile, int create)
 		goto end;
 	}
 	if (serialfile == NULL) {
-		BUF_strlcpy(buf, CAfile, len);
+		strlcpy(buf, CAfile, len);
 		for (p = buf; *p; p++)
 			if (*p == '.') {
 				*p = '\0';
 				break;
 			}
-		BUF_strlcat(buf, POSTFIX, len);
+		strlcat(buf, POSTFIX, len);
 	} else
-		BUF_strlcpy(buf, serialfile, len);
+		strlcpy(buf, serialfile, len);
 
 	serial = load_serial(buf, create, NULL);
 	if (serial == NULL)