diff options
| -rw-r--r-- | apps/pkcs12.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/a_time.c | 2 | ||||
| -rw-r--r-- | crypto/asn1/t_pkey.c | 10 |
3 files changed, 4 insertions, 10 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 64b4b32be7..536cf57c15 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -538,7 +538,7 @@ int MAIN(int argc, char **argv) #endif if(!noprompt && - EVP_read_pw_string(pass, 50, "Enter Export Password:", 1)) + EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1)) { BIO_printf (bio_err, "Can't read Password\n"); goto export_end; diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c index 27ddd30899..6e5e9d845d 100644 --- a/crypto/asn1/a_time.c +++ b/crypto/asn1/a_time.c @@ -152,7 +152,7 @@ ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZE if (t->data[0] >= '5') strcpy(str, "19"); else strcpy(str, "20"); - strcat(str, (char *)t->data); + BUF_strlcat(str, (char *)t->data, t->length+2); return ret; } diff --git a/crypto/asn1/t_pkey.c b/crypto/asn1/t_pkey.c index bd89c1dc11..73f32ff84f 100644 --- a/crypto/asn1/t_pkey.c +++ b/crypto/asn1/t_pkey.c @@ -562,18 +562,12 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf, int off) { int n,i; - char str[128]; const char *neg; if (num == NULL) return(1); neg = (BN_get_sign(num))?"-":""; - if (off) - { - if (off > 128) off=128; - memset(str,' ',off); - if (BIO_write(bp,str,off) <= 0) return(0); - } - + if(!BIO_indent(bp,off,128)) + return 0; if (BN_is_zero(num)) { if (BIO_printf(bp, "%s 0\n", number) <= 0) |