diff options
| author | miod <> | 2014-07-11 12:59:10 +0000 |
|---|---|---|
| committer | miod <> | 2014-07-11 12:59:10 +0000 |
| commit | ebc8a4576687c9fe05cd2c1717f90e4195597b75 (patch) | |
| tree | d9af14e4590d5c56768e51884219332a1b7735f0 | |
| parent | 57050f2e69d6cc233b2dcbed9c827042599bc7ae (diff) | |
| download | openbsd-ebc8a4576687c9fe05cd2c1717f90e4195597b75.tar.gz openbsd-ebc8a4576687c9fe05cd2c1717f90e4195597b75.tar.bz2 openbsd-ebc8a4576687c9fe05cd2c1717f90e4195597b75.zip | |
Remove duplicate 0x for salt len in output; Martin Kaiser via OpenSSL trunk.
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_ameth.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_ameth.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_ameth.c b/src/lib/libcrypto/rsa/rsa_ameth.c index bcc0eee4b9..f842a7c70c 100644 --- a/src/lib/libcrypto/rsa/rsa_ameth.c +++ b/src/lib/libcrypto/rsa/rsa_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_ameth.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_ameth.c,v 1.12 2014/07/11 12:59:10 miod Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -361,7 +361,7 @@ rsa_pss_param_print(BIO *bp, RSA_PSS_PARAMS *pss, X509_ALGOR *maskHash, | |||
| 361 | if (pss->saltLength) { | 361 | if (pss->saltLength) { |
| 362 | if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0) | 362 | if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0) |
| 363 | goto err; | 363 | goto err; |
| 364 | } else if (BIO_puts(bp, "0x14 (default)") <= 0) | 364 | } else if (BIO_puts(bp, "14 (default)") <= 0) |
| 365 | goto err; | 365 | goto err; |
| 366 | BIO_puts(bp, "\n"); | 366 | BIO_puts(bp, "\n"); |
| 367 | 367 | ||
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_ameth.c b/src/lib/libssl/src/crypto/rsa/rsa_ameth.c index bcc0eee4b9..f842a7c70c 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_ameth.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_ameth.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_ameth.c,v 1.11 2014/07/11 08:44:49 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_ameth.c,v 1.12 2014/07/11 12:59:10 miod Exp $ */ |
| 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL | 2 | /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL |
| 3 | * project 2006. | 3 | * project 2006. |
| 4 | */ | 4 | */ |
| @@ -361,7 +361,7 @@ rsa_pss_param_print(BIO *bp, RSA_PSS_PARAMS *pss, X509_ALGOR *maskHash, | |||
| 361 | if (pss->saltLength) { | 361 | if (pss->saltLength) { |
| 362 | if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0) | 362 | if (i2a_ASN1_INTEGER(bp, pss->saltLength) <= 0) |
| 363 | goto err; | 363 | goto err; |
| 364 | } else if (BIO_puts(bp, "0x14 (default)") <= 0) | 364 | } else if (BIO_puts(bp, "14 (default)") <= 0) |
| 365 | goto err; | 365 | goto err; |
| 366 | BIO_puts(bp, "\n"); | 366 | BIO_puts(bp, "\n"); |
| 367 | 367 | ||