separate out pbkdf2 stuff

Makefile

@@ -8,9 +8,9 @@ WARNFLAGS= -Wsystem-headers -Werror -Wall -W -Wno-unused-parameter \
 WARNFLAGS_LINUX= -Wall
 
 linux:
-	gcc -O0 $(WARNFLAGS_LINUX) -g main.c tcplay.c crc32.c safe_mem.c io.c crypto.c generic_xts.c crypto-gcrypt.c hdr.c humanize.c -o tc-play -lcrypto -ldevmapper -luuid
+	gcc -O0 $(WARNFLAGS_LINUX) -g main.c tcplay.c crc32.c safe_mem.c io.c crypto.c generic_xts.c crypto-gcrypt.c pkbdf2-openssl.c hdr.c humanize.c -o tc-play -lcrypto -ldevmapper -luuid
 all:
-	gcc -O0 $(WARNFLAGS) -g main.c tcplay.c crc32.c safe_mem.c io.c crypto.c generic_xts.c crypto-dev.c hdr.c humanize.c -o tc-play -lcrypto -ldm -lprop
+	gcc -O0 $(WARNFLAGS) -g main.c tcplay.c crc32.c safe_mem.c io.c crypto.c generic_xts.c crypto-dev.c pbkdf2-openssl.c hdr.c humanize.c -o tc-play -lcrypto -ldm -lprop
 lib:
 	gcc $(WARNFLAGS) -c -fPIC -O0 -Wall -g tcplay_api.c tcplay.c crc32.c safe_mem.c io.c crypto-dev.c hdr.c
 	gcc -shared -Wl,-version-script=tcplay.map -o libtcplay.so tcplay_api.o tcplay.o crc32.o safe_mem.o io.o crypto-dev.o hdr.o

crypto-dev.c

@@ -36,7 +36,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <string.h>
-#include <openssl/evp.h>
 
 #include "tcplay.h"
 
@@ -156,36 +155,10 @@ tc_crypto_init(void)
 {
 	int allowed;
 
-	OpenSSL_add_all_algorithms();
-
 	allowed = getallowsoft();
 	if (allowed == 0)
 		setallowsoft(1);
 
 	return 0;
 }
 
-int
-pbkdf2(struct pbkdf_prf_algo *hash, const char *pass, int passlen,
-    const unsigned char *salt, int saltlen,
-    int keylen, unsigned char *out)
-{
-	const EVP_MD *md;
-	int r;
-
-	md = EVP_get_digestbyname(hash->name);
-	if (md == NULL) {
-		tc_log(1, "Hash %s not found\n", hash->name);
-		return ENOENT;
-	}
-	r = PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen,
-	    hash->iteration_count, md, keylen, out);
-
-	if (r == 0) {
-		tc_log(1, "Error in PBKDF2\n");
-		return EINVAL;
-	}
-
-	return 0;
-}
-

crypto-gcrypt.c

@@ -212,22 +212,3 @@ tc_crypto_init(void)
 	return 0;
 }
 
-int
-pbkdf2(struct pbkdf_prf_algo *hash, const char *pass, int passlen,
-    const unsigned char *salt, int saltlen,
-    int keylen, unsigned char *out)
-{
-	gpg_error_t err;
-
-	err = gcry_kdf_derive(pass, passlen, GCRY_KDF_PBKDF2,
-	    get_gcrypt_hash_id(hash),
-            salt, saltlen, hash->iteration_count, keylen, out);
-
-	if (err) {
-		tc_log(1, "Error in PBKDF2\n");
-		return EINVAL;
-	}
-
-	return 0;
-}
-

pbkdf2-gcrypt.c

@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2011 Alex Hornung <alex@alexhornung.com>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include <gcrypt.h>
+
+#include "tcplay.h"
+
+int
+pbkdf2(struct pbkdf_prf_algo *hash, const char *pass, int passlen,
+    const unsigned char *salt, int saltlen,
+    int keylen, unsigned char *out)
+{
+	gpg_error_t err;
+
+	err = gcry_kdf_derive(pass, passlen, GCRY_KDF_PBKDF2,
+	    get_gcrypt_hash_id(hash),
+            salt, saltlen, hash->iteration_count, keylen, out);
+
+	if (err) {
+		tc_log(1, "Error in PBKDF2\n");
+		return EINVAL;
+	}
+
+	return 0;
+}
+

pbkdf2-openssl.c

@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2011 Alex Hornung <alex@alexhornung.com>.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <errno.h>
+#include <openssl/evp.h>
+
+#include "tcplay.h"
+
+
+int
+pbkdf2(struct pbkdf_prf_algo *hash, const char *pass, int passlen,
+    const unsigned char *salt, int saltlen,
+    int keylen, unsigned char *out)
+{
+	const EVP_MD *md;
+	int r;
+
+	OpenSSL_add_all_algorithms();
+
+	md = EVP_get_digestbyname(hash->name);
+	if (md == NULL) {
+		tc_log(1, "Hash %s not found\n", hash->name);
+		return ENOENT;
+	}
+	r = PKCS5_PBKDF2_HMAC(pass, passlen, salt, saltlen,
+	    hash->iteration_count, md, keylen, out);
+
+	if (r == 0) {
+		tc_log(1, "Error in PBKDF2\n");
+		return EINVAL;
+	}
+
+	return 0;
+}
+