Add support for using freebl3 for SHA1 and MD5 hashing

Since we don't want to link freebl3 to libp11-kit.so where it isn't
needed, move the SHA-1 and MD5 digest functionality to the trust/
directory.

1 files changed, 7 insertions, 7 deletions

diff --git a/trust/extract-jks.c b/trust/extract-jks.c
index 987ea26..8a39cfd 100644
--- a/trust/extract-jks.c
+++ b/trust/extract-jks.c
@@ -39,7 +39,7 @@
 #include "compat.h"
 #include "debug.h"
 #include "extract.h"
-#include "hash.h"
+#include "digest.h"
 #include "message.h"
 #include "save.h"
 
@@ -299,13 +299,13 @@ prepare_jks_buffer (P11KitIter *iter,
 	 * as the password for this keyed digest.
 	 */
 	length = buffer->len;
-	digest = p11_buffer_append (buffer, P11_HASH_SHA1_LEN);
+	digest = p11_buffer_append (buffer, P11_DIGEST_SHA1_LEN);
 	return_val_if_fail (digest != NULL, false);
-	p11_hash_sha1 (digest,
-	               "\000c\000h\000a\000n\000g\000e\000i\000t", 16, /* default password */
-	               "Mighty Aphrodite", 16, /* go figure */
-	               buffer->data, length,
-	               NULL);
+	p11_digest_sha1 (digest,
+	                 "\000c\000h\000a\000n\000g\000e\000i\000t", 16, /* default password */
+	                 "Mighty Aphrodite", 16, /* go figure */
+	                 buffer->data, length,
+	                 NULL);
 
 	return_val_if_fail (p11_buffer_ok (buffer), false);
 	return true;