aboutsummaryrefslogtreecommitdiffstats
path: root/crypto/rsa
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2016-11-21 01:34:56 +0000
committerDr. Stephen Henson <steve@openssl.org>2017-01-08 01:42:46 +0000
commitd771441d9ba5ccb55fa6f7a3b6ec5bac1ebc1d1f (patch)
tree0538c0692bea5e7961285ddf109e8745f9a9d84e /crypto/rsa
parent6745a1ff3268f3e3598df3ec3c34b08b369ed1bf (diff)
downloadopenssl-d771441d9ba5ccb55fa6f7a3b6ec5bac1ebc1d1f.tar.gz
Add pss field to RSA structure and free it.
Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/2177)
Diffstat (limited to 'crypto/rsa')
-rw-r--r--crypto/rsa/rsa_lib.c1
-rw-r--r--crypto/rsa/rsa_locl.h2
2 files changed, 3 insertions, 0 deletions
diff --git a/crypto/rsa/rsa_lib.c b/crypto/rsa/rsa_lib.c
index e41644b099..8f934d8abc 100644
--- a/crypto/rsa/rsa_lib.c
+++ b/crypto/rsa/rsa_lib.c
@@ -152,6 +152,7 @@ void RSA_free(RSA *r)
BN_clear_free(r->dmp1);
BN_clear_free(r->dmq1);
BN_clear_free(r->iqmp);
+ RSA_PSS_PARAMS_free(r->pss);
BN_BLINDING_free(r->blinding);
BN_BLINDING_free(r->mt_blinding);
OPENSSL_free(r->bignum_data);
diff --git a/crypto/rsa/rsa_locl.h b/crypto/rsa/rsa_locl.h
index e342ca8dfb..fe55b35aae 100644
--- a/crypto/rsa/rsa_locl.h
+++ b/crypto/rsa/rsa_locl.h
@@ -28,6 +28,8 @@ struct rsa_st {
BIGNUM *dmp1;
BIGNUM *dmq1;
BIGNUM *iqmp;
+ /* If a PSS only key this contains the parameter restrictions */
+ RSA_PSS_PARAMS *pss;
/* be careful using this if the RSA structure is shared */
CRYPTO_EX_DATA ex_data;
CRYPTO_REF_COUNT references;