crypto: Rename check_key_file() -> check_private_key_file().

[paraslash.git] / crypt.c

diff --git a/crypt.c b/crypt.c
index 8116fb6eeacdbeaa0f1f22d14cfcc3726ee3bbbf..085c0563d0afb2eb23669d4084e4f83c92ff5540 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -65,12 +65,7 @@ static EVP_PKEY *load_key(const char *file, int private)
 {
        BIO *key;
        EVP_PKEY *pkey = NULL;
-       int ret = check_key_file(file, private);
 
-       if (ret < 0) {
-               PARA_ERROR_LOG("%s\n", para_strerror(-ret));
-               return NULL;
-       }
        key = BIO_new(BIO_s_file());
        if (!key)
                return NULL;
@@ -229,6 +224,9 @@ int priv_decrypt(const char *key_file, unsigned char *outbuf,
        struct asymmetric_key *priv;
        int ret;
 
+       ret = check_private_key_file(key_file);
+       if (ret < 0)
+               return ret;
        if (inlen < 0)
                return -E_RSA;
        ret = get_asymmetric_key(key_file, LOAD_PRIVATE_KEY, &priv);