diff options
| author |   miod <miod@openbsd.org> | 2014-07-11 12:59:10 +0000 |
|---|---|---|
| committer | miod <miod@openbsd.org> | 2014-07-11 12:59:10 +0000 |
| commit | bd9f72f9727ab8abce32dfcfcec60b8ea026cf8a (patch) | |
| tree | 2d43782b3089a3747f095786dfe4a02d0aeea0ef | |
| parent | sgmap loading didnt respect the dmamaps max number of segments. (diff) | |
| download | wireguard-openbsd-bd9f72f9727ab8abce32dfcfcec60b8ea026cf8a.tar.xz wireguard-openbsd-bd9f72f9727ab8abce32dfcfcec60b8ea026cf8a.zip | |
Remove duplicate 0x for salt len in output; Martin Kaiser via OpenSSL trunk.
| -rw-r--r-- | lib/libcrypto/rsa/rsa_ameth.c | 4 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/rsa/rsa_ameth.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/lib/libcrypto/rsa/rsa_ameth.c b/lib/libcrypto/rsa/rsa_ameth.c index bcc0eee4b9b..f842a7c70cc 100644 --- a/lib/libcrypto/rsa/rsa_ameth.c +++ b/lib/libcrypto/rsa/rsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_ameth.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ +/* $OpenBSD: rsa_ameth.c,v 1.12 2014/07/11 12:59:10 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -361,7 +361,7 @@ rsa_pss_param_print(BIO *bp, RSA_PSS_PARAMS *pss, X509_ALGOR *maskHash, if (pss->saltLength) { if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0) goto err; - } else if (BIO_puts(bp, "0x14 (default)") <= 0) + } else if (BIO_puts(bp, "14 (default)") <= 0) goto err; BIO_puts(bp, "\n"); diff --git a/lib/libssl/src/crypto/rsa/rsa_ameth.c b/lib/libssl/src/crypto/rsa/rsa_ameth.c index bcc0eee4b9b..f842a7c70cc 100644 --- a/lib/libssl/src/crypto/rsa/rsa_ameth.c +++ b/lib/libssl/src/crypto/rsa/rsa_ameth.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsa_ameth.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ +/* $OpenBSD: rsa_ameth.c,v 1.12 2014/07/11 12:59:10 miod Exp $ */ /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL * project 2006. */ @@ -361,7 +361,7 @@ rsa_pss_param_print(BIO *bp, RSA_PSS_PARAMS *pss, X509_ALGOR *maskHash, if (pss->saltLength) { if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0) goto err; - } else if (BIO_puts(bp, "0x14 (default)") <= 0) + } else if (BIO_puts(bp, "14 (default)") <= 0) goto err; BIO_puts(bp, "\n"); |