diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-12-27 14:40:17 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-12-27 14:40:17 +0000 |
| commit | d420ac2c7d4ba9d99ff2c257a3ad71ecc6d876e2 (patch) | |
| tree | 84414c7d794c6286588d2042f060036378311348 /crypto/x509v3/v3_info.c | |
| parent | b79aa47a0c8478bea62fc2bb55f99e0be172da3d (diff) | |
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>
Diffstat (limited to 'crypto/x509v3/v3_info.c')
| -rw-r--r-- | crypto/x509v3/v3_info.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/crypto/x509v3/v3_info.c b/crypto/x509v3/v3_info.c index 4e1a1f3a4d..b46ff13613 100644 --- a/crypto/x509v3/v3_info.c +++ b/crypto/x509v3/v3_info.c @@ -105,7 +105,7 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method STACK_OF(CONF_VALUE) *ret) { ACCESS_DESCRIPTION *desc; - int i; + int i,nlen; char objtmp[80], *ntmp; CONF_VALUE *vtmp; for(i = 0; i < sk_ACCESS_DESCRIPTION_num(ainfo); i++) { @@ -114,15 +114,16 @@ static STACK_OF(CONF_VALUE) *i2v_AUTHORITY_INFO_ACCESS(X509V3_EXT_METHOD *method if(!ret) break; vtmp = sk_CONF_VALUE_value(ret, i); i2t_ASN1_OBJECT(objtmp, sizeof objtmp, desc->method); - ntmp = OPENSSL_malloc(strlen(objtmp) + strlen(vtmp->name) + 5); + nlen = strlen(objtmp) + strlen(vtmp->name) + 5; + ntmp = OPENSSL_malloc(nlen); if(!ntmp) { X509V3err(X509V3_F_I2V_AUTHORITY_INFO_ACCESS, ERR_R_MALLOC_FAILURE); return NULL; } - strcpy(ntmp, objtmp); - strcat(ntmp, " - "); - strcat(ntmp, vtmp->name); + BUF_strlcpy(ntmp, objtmp, nlen); + BUF_strlcat(ntmp, " - ", nlen); + BUF_strlcat(ntmp, vtmp->name, nlen); OPENSSL_free(vtmp->name); vtmp->name = ntmp; |