lib-dcrypt: drop format from key_load_public

diff --git a/src/lib-dcrypt/dcrypt-openssl.c b/src/lib-dcrypt/dcrypt-openssl.c
index 0f6553292ff4a31135acb76f8442c95e458e8975..f20fba9feedc67b689b103965fc38af782ddd14a 100644 (file)
--- a/src/lib-dcrypt/dcrypt-openssl.c
+++ b/src/lib-dcrypt/dcrypt-openssl.c
@@ -1596,9 +1596,10 @@ bool dcrypt_openssl_load_private_key(struct dcrypt_private_key **key_r,
 }
 
 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,

diff --git a/src/lib-dcrypt/dcrypt-private.h b/src/lib-dcrypt/dcrypt-private.h
index 1c512c8a75dae6e9d8c55f37c8739e293d602f28..ca3e608fe8ca47f95f70aae4e9fa96f8be6a4a0a 100644 (file)
--- a/src/lib-dcrypt/dcrypt-private.h
+++ b/src/lib-dcrypt/dcrypt-private.h
@@ -65,8 +65,8 @@ struct dcrypt_vfs {
 
        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);

diff --git a/src/lib-dcrypt/dcrypt.c b/src/lib-dcrypt/dcrypt.c
index df2f1835fe46f76ab839d933764fbc5f379b3b2a..3926fa8fb900ae93a790d18cbed28601d02b0185 100644 (file)
--- a/src/lib-dcrypt/dcrypt.c
+++ b/src/lib-dcrypt/dcrypt.c
@@ -205,9 +205,9 @@ bool dcrypt_key_load_private(struct dcrypt_private_key **key_r, const char *data
 {
        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)

diff --git a/src/lib-dcrypt/dcrypt.h b/src/lib-dcrypt/dcrypt.h
index 4bb516a5044475244b16f5740e3162124baf3d86..45f7be4db9cad6d99f47b33dde09fb9b1bfa2baa 100644 (file)
--- a/src/lib-dcrypt/dcrypt.h
+++ b/src/lib-dcrypt/dcrypt.h
@@ -175,7 +175,8 @@ bool dcrypt_keypair_generate(struct dcrypt_keypair *pair_r, enum dcrypt_key_type
 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);

diff --git a/src/lib-dcrypt/test-crypto.c b/src/lib-dcrypt/test-crypto.c
index ef980c498eae5ac525830e48c73f4276a538b3c1..1eb9150e00de30c139b74225fef6ebfc13432d2b 100644 (file)
--- a/src/lib-dcrypt/test-crypto.c
+++ b/src/lib-dcrypt/test-crypto.c
@@ -353,7 +353,7 @@ void test_load_v1_public_key(void)
        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 @@ void test_load_v2_public_key(void)
        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 @@ void test_load_invalid_keys(void) {
        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);
 

diff --git a/src/lib-dcrypt/test-stream.c b/src/lib-dcrypt/test-stream.c
index e352519fdc593085a27925e0a38d441e03df68c9..2cc2d7ebebecd55791f7ab2445eb71372d8e549e 100644 (file)
--- a/src/lib-dcrypt/test-stream.c
+++ b/src/lib-dcrypt/test-stream.c
@@ -428,9 +428,9 @@ int main(void) {
        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,