diff options
| author | Rich Salz <rsalz@openssl.org> | 2017-06-14 20:34:37 -0400 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-07-05 11:32:35 +1000 |
| commit | 0904e79a6e6109240d5a552f2699408b26cf63ee (patch) | |
| tree | df0b4928a751b05779164cf7dd84265407bea332 /crypto/evp/evp_pbe.c | |
| parent | ff281ee8369350d88e8b57af139614f5683e1e8c (diff) | |
| download | openssl-0904e79a6e6109240d5a552f2699408b26cf63ee.tar.gz | |
Undo commit d420ac2
[extended tests]
Original text:
Use BUF_strlcpy() instead of strcpy().
Use BUF_strlcat() instead of strcat().
Use BIO_snprintf() instead of sprintf().
In some cases, keep better track of buffer lengths.
This is part of a large change submitted by Markus Friedl <markus@openbsd.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/3701)
Diffstat (limited to 'crypto/evp/evp_pbe.c')
| -rw-r--r-- | crypto/evp/evp_pbe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/evp/evp_pbe.c b/crypto/evp/evp_pbe.c index ce7aa2cfa1..354532d8de 100644 --- a/crypto/evp/evp_pbe.c +++ b/crypto/evp/evp_pbe.c @@ -90,7 +90,7 @@ int EVP_PBE_CipherInit(ASN1_OBJECT *pbe_obj, const char *pass, int passlen, char obj_tmp[80]; EVPerr(EVP_F_EVP_PBE_CIPHERINIT, EVP_R_UNKNOWN_PBE_ALGORITHM); if (!pbe_obj) - OPENSSL_strlcpy(obj_tmp, "NULL", sizeof obj_tmp); + strcpy(obj_tmp, "NULL"); else i2t_ASN1_OBJECT(obj_tmp, sizeof obj_tmp, pbe_obj); ERR_add_error_data(2, "TYPE=", obj_tmp); |