Simplified preparation of signing code.

1 files changed, 5 insertions, 27 deletions

diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 4e3b640205..86e45edd43 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -257,21 +257,10 @@ gnutls_privkey_sign_data (gnutls_privkey_t signer,
       return ret;
     }
 
-  switch (signer->pk_algorithm)
+  ret = pk_prepare_hash (signer->pk_algorithm, hash, &digest);
+  if (ret < 0)
     {
-    case GNUTLS_PK_RSA:
-      ret = pk_prepare_pkcs1_rsa_hash (hash, &digest);
-      if (ret < 0)
-	{
-	  gnutls_assert ();
-	  return ret;
-	}
-      break;
-    case GNUTLS_PK_DSA:
-      break;
-    default:
-      gnutls_assert ();
-      ret = GNUTLS_E_UNIMPLEMENTED_FEATURE;
+      gnutls_assert();
       goto cleanup;
     }
 
@@ -329,21 +318,10 @@ gnutls_privkey_sign_hash2 (gnutls_privkey_t signer,
   digest.size = hash_data->size;
   memcpy(digest.data, hash_data->data, digest.size);
 
-  switch (signer->pk_algorithm)
+  ret = pk_prepare_hash (signer->pk_algorithm, hash_algo, &digest);
+  if (ret < 0)
     {
-    case GNUTLS_PK_RSA:
-      ret = pk_prepare_pkcs1_rsa_hash (hash_algo, &digest);
-      if (ret < 0)
-	{
-	  gnutls_assert ();
-	  return ret;
-	}
-      break;
-    case GNUTLS_PK_DSA:
-      break;
-    default:
       gnutls_assert ();
-      ret = GNUTLS_E_UNIMPLEMENTED_FEATURE;
       goto cleanup;
     }