Moved pk_* functions to pk.c

diff --git a/lib/pk.c b/lib/pk.c
index 60d1f78087ba074b52404b0c4f764c1e90affc8b..94c89247e0b706528ccc785c169d7cc5c457ca80 100644 (file)
--- a/lib/pk.c
+++ b/lib/pk.c
@@ -635,3 +635,71 @@ int _gnutls_params_get_ecc_raw(const gnutls_pk_params_st* params,
        return 0;
 
 }
+
+int
+pk_hash_data(gnutls_pk_algorithm_t pk, const mac_entry_st * hash,
+            gnutls_pk_params_st * params,
+            const gnutls_datum_t * data, gnutls_datum_t * digest)
+{
+       int ret;
+
+       digest->size = _gnutls_hash_get_algo_len(hash);
+       digest->data = gnutls_malloc(digest->size);
+       if (digest->data == NULL) {
+               gnutls_assert();
+               return GNUTLS_E_MEMORY_ERROR;
+       }
+
+       ret =
+           _gnutls_hash_fast((gnutls_digest_algorithm_t)hash->id, data->data, data->size,
+                             digest->data);
+       if (ret < 0) {
+               gnutls_assert();
+               goto cleanup;
+       }
+
+       return 0;
+
+      cleanup:
+       gnutls_free(digest->data);
+       return ret;
+}
+
+
+/* 
+ * This function will do RSA PKCS #1 1.5 encoding
+ * on the given digest. The given digest must be allocated
+ * and will be freed if replacement is required.
+ */
+int
+pk_prepare_hash(gnutls_pk_algorithm_t pk,
+               const mac_entry_st * hash, gnutls_datum_t * digest)
+{
+       int ret;
+       gnutls_datum_t old_digest = { digest->data, digest->size };
+
+       switch (pk) {
+       case GNUTLS_PK_RSA:
+               if (unlikely(hash == NULL))
+                       return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
+               /* Encode the digest as a DigestInfo
+                */
+               if ((ret =
+                    encode_ber_digest_info(hash, &old_digest,
+                                           digest)) != 0) {
+                       gnutls_assert();
+                       return ret;
+               }
+
+               _gnutls_free_datum(&old_digest);
+               break;
+       case GNUTLS_PK_DSA:
+       case GNUTLS_PK_EC:
+               break;
+       default:
+               gnutls_assert();
+               return GNUTLS_E_UNIMPLEMENTED_FEATURE;
+       }
+
+       return 0;
+}

diff --git a/lib/pk.h b/lib/pk.h
index 34712f509856d17879e001bdb45f8a01294cd8d5..4b52146e78b26c65ccbca663f9afc54726092deb 100644 (file)
--- a/lib/pk.h
+++ b/lib/pk.h
@@ -94,4 +94,10 @@ int _gnutls_params_get_ecc_raw(const gnutls_pk_params_st* params,
                                       gnutls_datum_t * y,
                                       gnutls_datum_t * k);
 
+int pk_prepare_hash(gnutls_pk_algorithm_t pk, const mac_entry_st * hash,
+                   gnutls_datum_t * output);
+int pk_hash_data(gnutls_pk_algorithm_t pk, const mac_entry_st * hash,
+                gnutls_pk_params_st * params, const gnutls_datum_t * data,
+                gnutls_datum_t * digest);
+
 #endif                         /* GNUTLS_PK_H */

diff --git a/lib/tls-sig.c b/lib/tls-sig.c
index 8706ac598bc805843b099580e7d16b8e39a589bf..f51966aa3e65c039db53fbb82f29b44b27f75186 100644 (file)
--- a/lib/tls-sig.c
+++ b/lib/tls-sig.c
@@ -681,70 +681,3 @@ _gnutls_handshake_sign_crt_vrfy(gnutls_session_t session,
        return ret;
 }
 
-int
-pk_hash_data(gnutls_pk_algorithm_t pk, const mac_entry_st * hash,
-            gnutls_pk_params_st * params,
-            const gnutls_datum_t * data, gnutls_datum_t * digest)
-{
-       int ret;
-
-       digest->size = _gnutls_hash_get_algo_len(hash);
-       digest->data = gnutls_malloc(digest->size);
-       if (digest->data == NULL) {
-               gnutls_assert();
-               return GNUTLS_E_MEMORY_ERROR;
-       }
-
-       ret =
-           _gnutls_hash_fast((gnutls_digest_algorithm_t)hash->id, data->data, data->size,
-                             digest->data);
-       if (ret < 0) {
-               gnutls_assert();
-               goto cleanup;
-       }
-
-       return 0;
-
-      cleanup:
-       gnutls_free(digest->data);
-       return ret;
-}
-
-
-/* 
- * This function will do RSA PKCS #1 1.5 encoding
- * on the given digest. The given digest must be allocated
- * and will be freed if replacement is required.
- */
-int
-pk_prepare_hash(gnutls_pk_algorithm_t pk,
-               const mac_entry_st * hash, gnutls_datum_t * digest)
-{
-       int ret;
-       gnutls_datum_t old_digest = { digest->data, digest->size };
-
-       switch (pk) {
-       case GNUTLS_PK_RSA:
-               if (unlikely(hash == NULL))
-                       return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
-               /* Encode the digest as a DigestInfo
-                */
-               if ((ret =
-                    encode_ber_digest_info(hash, &old_digest,
-                                           digest)) != 0) {
-                       gnutls_assert();
-                       return ret;
-               }
-
-               _gnutls_free_datum(&old_digest);
-               break;
-       case GNUTLS_PK_DSA:
-       case GNUTLS_PK_EC:
-               break;
-       default:
-               gnutls_assert();
-               return GNUTLS_E_UNIMPLEMENTED_FEATURE;
-       }
-
-       return 0;
-}

diff --git a/lib/tls-sig.h b/lib/tls-sig.h
index 0bfdc4edec7c175703c93c096292ee39826269ea..5ba37128be0e5deabc0dcd471d028e0a5176a6e9 100644 (file)
--- a/lib/tls-sig.h
+++ b/lib/tls-sig.h
@@ -55,10 +55,4 @@ int _gnutls_handshake_verify_data(gnutls_session_t session,
                                  gnutls_datum_t * signature,
                                  gnutls_sign_algorithm_t algo);
 
-int pk_prepare_hash(gnutls_pk_algorithm_t pk, const mac_entry_st * hash,
-                   gnutls_datum_t * output);
-int pk_hash_data(gnutls_pk_algorithm_t pk, const mac_entry_st * hash,
-                gnutls_pk_params_st * params, const gnutls_datum_t * data,
-                gnutls_datum_t * digest);
-
 #endif