]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
lib-dcrypt: Check DCRYPT_KEY_USAGE_NONE instead of NULL
authorAki Tuomi <aki.tuomi@open-xchange.com>
Wed, 27 Dec 2023 21:15:28 +0000 (23:15 +0200)
committerAki Tuomi <aki.tuomi@open-xchange.com>
Wed, 17 Jan 2024 08:24:18 +0000 (10:24 +0200)
Function key_usage_to_jwk_use() does not return NULL.

src/lib-dcrypt/dcrypt-openssl1.c
src/lib-dcrypt/dcrypt-openssl3.c

index a6db73cd7fd4d6c32dea7e836feccc502a23c313..e226632131e825fed818d8ca20c5cc236dd604f4 100644 (file)
@@ -2015,7 +2015,7 @@ static bool store_jwk_ec_key(EVP_PKEY *pkey, bool is_private_key,
        bn2base64url(y, b64url_temp);
        json_ostream_nwrite_string_buffer(joutput, "y", b64url_temp);
 
-       if (use != NULL)
+       if (usage != DCRYPT_KEY_USAGE_NONE)
                json_ostream_nwrite_string(joutput, "use", use);
        if (key_id != NULL)
                json_ostream_nwrite_string(joutput, "kid", key_id);
index a9cff7fbcbb38927015cf1367b8278c99fa1fa9c..5ed2be4f9b0c69a60da9c52480a0b7e137a8873b 100644 (file)
@@ -1982,7 +1982,7 @@ static bool store_jwk_ec_key(EVP_PKEY *pkey, bool is_private_key,
        bn2base64url(y, b64url_temp);
        json_ostream_nwrite_string_buffer(joutput, "y", b64url_temp);
 
-       if (use != NULL)
+       if (usage != DCRYPT_KEY_USAGE_NONE)
                json_ostream_nwrite_string(joutput, "use", use);
        if (key_id != NULL)
                json_ostream_nwrite_string(joutput, "kid", key_id);