diff options
| author | jsing <> | 2014-07-10 11:35:31 +0000 |
|---|---|---|
| committer | jsing <> | 2014-07-10 11:35:31 +0000 |
| commit | bd4341e90140ba86e47e2a819a931d54dec8b512 (patch) | |
| tree | cea1d7e615812c6b805cce174329ff767464951c | |
| parent | 9421b506453fdfe6759d65eb72db5aba17690e4f (diff) | |
| download | openbsd-bd4341e90140ba86e47e2a819a931d54dec8b512.tar.gz openbsd-bd4341e90140ba86e47e2a819a931d54dec8b512.tar.bz2 openbsd-bd4341e90140ba86e47e2a819a931d54dec8b512.zip | |
Stop playing with the RSA_FLAG_BLINDING flag. It does nothing.
ok miod@
| -rw-r--r-- | src/lib/libcrypto/rsa/rsa_crpt.c | 4 | ||||
| -rw-r--r-- | src/lib/libssl/src/crypto/rsa/rsa_crpt.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/libcrypto/rsa/rsa_crpt.c b/src/lib/libcrypto/rsa/rsa_crpt.c index c216c1bae4..5edd2d7c5c 100644 --- a/src/lib/libcrypto/rsa/rsa_crpt.c +++ b/src/lib/libcrypto/rsa/rsa_crpt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_crpt.c,v 1.7 2014/07/10 07:43:11 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_crpt.c,v 1.8 2014/07/10 11:35:31 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -112,7 +112,6 @@ RSA_blinding_off(RSA *rsa) | |||
| 112 | { | 112 | { |
| 113 | BN_BLINDING_free(rsa->blinding); | 113 | BN_BLINDING_free(rsa->blinding); |
| 114 | rsa->blinding = NULL; | 114 | rsa->blinding = NULL; |
| 115 | rsa->flags &= ~RSA_FLAG_BLINDING; | ||
| 116 | rsa->flags |= RSA_FLAG_NO_BLINDING; | 115 | rsa->flags |= RSA_FLAG_NO_BLINDING; |
| 117 | } | 116 | } |
| 118 | 117 | ||
| @@ -128,7 +127,6 @@ RSA_blinding_on(RSA *rsa, BN_CTX *ctx) | |||
| 128 | if (rsa->blinding == NULL) | 127 | if (rsa->blinding == NULL) |
| 129 | goto err; | 128 | goto err; |
| 130 | 129 | ||
| 131 | rsa->flags |= RSA_FLAG_BLINDING; | ||
| 132 | rsa->flags &= ~RSA_FLAG_NO_BLINDING; | 130 | rsa->flags &= ~RSA_FLAG_NO_BLINDING; |
| 133 | ret = 1; | 131 | ret = 1; |
| 134 | err: | 132 | err: |
diff --git a/src/lib/libssl/src/crypto/rsa/rsa_crpt.c b/src/lib/libssl/src/crypto/rsa/rsa_crpt.c index c216c1bae4..5edd2d7c5c 100644 --- a/src/lib/libssl/src/crypto/rsa/rsa_crpt.c +++ b/src/lib/libssl/src/crypto/rsa/rsa_crpt.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: rsa_crpt.c,v 1.7 2014/07/10 07:43:11 jsing Exp $ */ | 1 | /* $OpenBSD: rsa_crpt.c,v 1.8 2014/07/10 11:35:31 jsing Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -112,7 +112,6 @@ RSA_blinding_off(RSA *rsa) | |||
| 112 | { | 112 | { |
| 113 | BN_BLINDING_free(rsa->blinding); | 113 | BN_BLINDING_free(rsa->blinding); |
| 114 | rsa->blinding = NULL; | 114 | rsa->blinding = NULL; |
| 115 | rsa->flags &= ~RSA_FLAG_BLINDING; | ||
| 116 | rsa->flags |= RSA_FLAG_NO_BLINDING; | 115 | rsa->flags |= RSA_FLAG_NO_BLINDING; |
| 117 | } | 116 | } |
| 118 | 117 | ||
| @@ -128,7 +127,6 @@ RSA_blinding_on(RSA *rsa, BN_CTX *ctx) | |||
| 128 | if (rsa->blinding == NULL) | 127 | if (rsa->blinding == NULL) |
| 129 | goto err; | 128 | goto err; |
| 130 | 129 | ||
| 131 | rsa->flags |= RSA_FLAG_BLINDING; | ||
| 132 | rsa->flags &= ~RSA_FLAG_NO_BLINDING; | 130 | rsa->flags &= ~RSA_FLAG_NO_BLINDING; |
| 133 | ret = 1; | 131 | ret = 1; |
| 134 | err: | 132 | err: |
