diff options
| author |   beck <beck@openbsd.org> | 2014-04-19 00:41:37 +0000 |
|---|---|---|
| committer | beck <beck@openbsd.org> | 2014-04-19 00:41:37 +0000 |
| commit | 143cedbbb5931c72fe516e48392a9203fe83567d (patch) | |
| tree | a36bf02143b29b597cd99a04fc086818b33930f2 /lib/libssl/src/apps/req.c | |
| parent | OpenSSH 6.5 and 6.6 have a bug that causes ~0.2% of connections (diff) | |
| download | wireguard-openbsd-143cedbbb5931c72fe516e48392a9203fe83567d.tar.xz wireguard-openbsd-143cedbbb5931c72fe516e48392a9203fe83567d.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 'lib/libssl/src/apps/req.c')
| -rw-r--r-- | lib/libssl/src/apps/req.c | 16 |
1 files changed, 8 insertions, 8 deletions
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); |