diff options
author | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-05-30 15:40:40 +0200 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@redhat.com> | 2017-05-31 14:50:22 +0200 |
commit | ec21815ce42e6a722000e379a736eb5c69802edb (patch) | |
tree | f3fd99cb8fc2bed6f01f75d3e2598d988d669985 | |
parent | a0a37ed0e80117c4a5ea80c101e75b8c46905d5a (diff) | |
download | gnutls-ec21815ce42e6a722000e379a736eb5c69802edb.tar.gz |
gnutls_privkey_sign_hash: removed duplicate code
The same code was available in _gnutls_privkey_find_sign_params().
Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>
-rw-r--r-- | lib/privkey.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/lib/privkey.c b/lib/privkey.c index dd57c041bc..9def4109a9 100644 --- a/lib/privkey.c +++ b/lib/privkey.c @@ -1257,7 +1257,7 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer, } ret = _gnutls_privkey_find_sign_params(signer, signer->pk_algorithm, - hash_algo, 0, ¶ms); + hash_algo, flags, ¶ms); if (ret < 0) { gnutls_assert(); return ret; @@ -1267,20 +1267,6 @@ gnutls_privkey_sign_hash(gnutls_privkey_t signer, return _gnutls_privkey_sign_raw_data(signer, hash_data, signature, ¶ms); - if (flags & GNUTLS_PRIVKEY_SIGN_FLAG_RSA_PSS) { - const mac_entry_st *me = hash_to_entry(hash_algo); - unsigned pk; - unsigned bits; - - pk = gnutls_privkey_get_pk_algorithm(signer, &bits); - - if (me == NULL || !GNUTLS_PK_IS_RSA(pk)) - return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST); - - params.pk = GNUTLS_PK_RSA_PSS; - params.salt_size = - _gnutls_find_rsa_pss_salt_size(bits, me, 0); - } return privkey_sign_hash(signer, hash_data, signature, ¶ms); } |