Mercurial > dovecot > core-2.2

changeset 20574:79fa3bdcfc95

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lib-dcrypt: drop format from key_load_public
author Martti Rannanjärvi <martti.rannanjarvi@dovecot.fi>
date Thu, 04 Aug 2016 12:57:58 +0300
parents 071903e5586b
children bceac5d8ae3b
files src/lib-dcrypt/dcrypt-openssl.c src/lib-dcrypt/dcrypt-private.h src/lib-dcrypt/dcrypt.c src/lib-dcrypt/dcrypt.h src/lib-dcrypt/test-crypto.c src/lib-dcrypt/test-stream.c
diffstat 6 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/src/lib-dcrypt/dcrypt-openssl.c	Thu Aug 04 12:52:20 2016 +0300
+++ b/src/lib-dcrypt/dcrypt-openssl.c	Thu Aug 04 12:57:58 2016 +0300
@@ -1596,9 +1596,10 @@
 }
 
 static
-bool dcrypt_openssl_load_public_key(struct dcrypt_public_key **key_r, enum dcrypt_key_format format,
+bool dcrypt_openssl_load_public_key(struct dcrypt_public_key **key_r,
 	const char *data, const char **error_r)
 {
+	enum dcrypt_key_format format;
 	enum dcrypt_key_version version;
 	enum dcrypt_key_kind kind;
 	if (!dcrypt_openssl_key_string_get_info(data, &format, &version,
--- a/src/lib-dcrypt/dcrypt-private.h	Thu Aug 04 12:52:20 2016 +0300
+++ b/src/lib-dcrypt/dcrypt-private.h	Thu Aug 04 12:57:58 2016 +0300
@@ -65,8 +65,8 @@
 
 	bool (*load_private_key)(struct dcrypt_private_key **key_r, const char *data,
 		const char *password, struct dcrypt_private_key *dec_key, const char **error_r);
-	bool (*load_public_key)(struct dcrypt_public_key **key_r, enum dcrypt_key_format format, const char *data,
-		const char **error_r);
+	bool (*load_public_key)(struct dcrypt_public_key **key_r,
+		const char *data, const char **error_r);
 
 	bool (*store_private_key)(struct dcrypt_private_key *key, enum dcrypt_key_format format, const char *cipher, buffer_t *destination,
 		const char *password, struct dcrypt_public_key *enc_key, const char **error_r);
--- a/src/lib-dcrypt/dcrypt.c	Thu Aug 04 12:52:20 2016 +0300
+++ b/src/lib-dcrypt/dcrypt.c	Thu Aug 04 12:57:58 2016 +0300
@@ -205,9 +205,9 @@
 {
 	return dcrypt_vfs->load_private_key(key_r, data, password, dec_key, error_r);
 }
-bool dcrypt_key_load_public(struct dcrypt_public_key **key_r, enum dcrypt_key_format format, const char *data, const char **error_r)
+bool dcrypt_key_load_public(struct dcrypt_public_key **key_r, const char *data, const char **error_r)
 {
-	return dcrypt_vfs->load_public_key(key_r, format, data, error_r);
+	return dcrypt_vfs->load_public_key(key_r, data, error_r);
 }
 bool dcrypt_key_store_private(struct dcrypt_private_key *key, enum dcrypt_key_format format, const char *cipher, buffer_t *destination,
 	const char *password, struct dcrypt_public_key *enc_key, const char **error_r)
--- a/src/lib-dcrypt/dcrypt.h	Thu Aug 04 12:52:20 2016 +0300
+++ b/src/lib-dcrypt/dcrypt.h	Thu Aug 04 12:57:58 2016 +0300
@@ -175,7 +175,8 @@
 bool dcrypt_key_load_private(struct dcrypt_private_key **key_r, const char *data,
 	const char *password, struct dcrypt_private_key *dec_key, const char **error_r);
 
-bool dcrypt_key_load_public(struct dcrypt_public_key **key_r, enum dcrypt_key_format format, const char *data, const char **error_r);
+bool dcrypt_key_load_public(struct dcrypt_public_key **key_r, const char *data,
+	const char **error_r);
 
 bool dcrypt_key_store_private(struct dcrypt_private_key *key, enum dcrypt_key_format format, const char *cipher, 
 	buffer_t *destination, const char *password, struct dcrypt_public_key *enc_key, const char **error_r);
--- a/src/lib-dcrypt/test-crypto.c	Thu Aug 04 12:52:20 2016 +0300
+++ b/src/lib-dcrypt/test-crypto.c	Thu Aug 04 12:57:58 2016 +0300
@@ -353,7 +353,7 @@
 	test_assert(encryption_key_hash == NULL);
 
 	struct dcrypt_public_key *pub_key = NULL;
-	ret = dcrypt_key_load_public(&pub_key, format, data1, &error);
+	ret = dcrypt_key_load_public(&pub_key, data1, &error);
 	test_assert(ret == TRUE);
 	test_assert(error == NULL);
 
@@ -426,7 +426,7 @@
 	test_begin("test_load_v2_public_key");
 	const char *key = "2:3058301006072a8648ce3d020106052b810400230344000301c50954e734dd8b410a607764a7057065a45510da52f2c6e28e0cb353b9c389fa8cb786943ae991fce9befed78fb162fbbc615415f06af06c8cc80c37f4e94ff6c7:185a7212542782e239111f9c19d126ad55b18ddaf4883d66afe8d9627c3607d8";
 
-	test_assert(dcrypt_key_load_public(&pub, DCRYPT_FORMAT_DOVECOT, key, &error));
+	test_assert(dcrypt_key_load_public(&pub, key, &error));
 
 	buffer_t *tmp = buffer_create_dynamic(default_pool, 256);
 
@@ -602,8 +602,7 @@
 	const char *key = "1:716:0301EB00973C4EFC8FCECA4EA33E941F50B561199A5159BCB6C2EED9DD1D62D65E38A254979D89E28F0C28883E71EE2AD264CD16B863FA094A8F6F69A56B62E8918040:7c9a1039ea2e4fed73e81dd3ffc3fa22ea4a28352939adde7bf8ea858b00fa4f";
 	struct dcrypt_public_key *pub_key = NULL;
 
-	bool ret = dcrypt_key_load_public(&pub_key, DCRYPT_FORMAT_DOVECOT,
-			key, &error);
+	bool ret = dcrypt_key_load_public(&pub_key, key, &error);
 	test_assert(ret == FALSE);
 	test_assert(error != NULL);
 
--- a/src/lib-dcrypt/test-stream.c	Thu Aug 04 12:52:20 2016 +0300
+++ b/src/lib-dcrypt/test-stream.c	Thu Aug 04 12:57:58 2016 +0300
@@ -428,9 +428,9 @@
 	random_init();
 
 	test_assert(dcrypt_key_load_private(&test_v1_kp.priv, key_v1_priv, NULL, NULL, NULL));
-	test_assert(dcrypt_key_load_public(&test_v1_kp.pub, DCRYPT_FORMAT_PEM, key_v1_pub, NULL));
+	test_assert(dcrypt_key_load_public(&test_v1_kp.pub, key_v1_pub, NULL));
 	test_assert(dcrypt_key_load_private(&test_v2_kp.priv, key_v2_priv, NULL, NULL, NULL));
-	test_assert(dcrypt_key_load_public(&test_v2_kp.pub, DCRYPT_FORMAT_PEM, key_v2_pub, NULL));
+	test_assert(dcrypt_key_load_public(&test_v2_kp.pub, key_v2_pub, NULL));
 
 	static void (*test_functions[])(void) = {
 		test_static_v1_input,