Allow to use PEM-s with params

artemeff · Apr 4, 2019 · 31db8ef · 31db8ef
1 parent fc6684b
commit 31db8ef
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/src/jwt.erl b/src/jwt.erl
@@ -318,5 +318,10 @@ append_claim(ClaimsSet, Key, Val) when is_map(ClaimsSet) ->
 append_claim(ClaimsSet, Key, Val) -> [{ Key, Val } | ClaimsSet].
 
 pem_to_key(Pem) ->
-    [Decoded] = public_key:pem_decode(Pem),
+    Decoded = case public_key:pem_decode(Pem) of
+        [_, Key] ->
+            Key;
+        [Key] ->
+            Key
+    end,
     public_key:pem_entry_decode(Decoded).
diff --git a/test/jwt_tests.erl b/test/jwt_tests.erl
@@ -1,5 +1,6 @@
 -module(jwt_tests).
 -include_lib("eunit/include/eunit.hrl").
+-include_lib("public_key/include/public_key.hrl").
 
 -define(SECRET, <<"supas3cri7">>).
 
@@ -193,6 +194,10 @@ expired_token_test_() ->
     [?_assertEqual({error, expired}, jwt:decode(ExpiredToken, ?SECRET)),
     ?_assertMatch({ok, #{<<"exp">> := _Exp }}, jwt:decode(UnexpiredToken, ?SECRET))].
 
+pem_to_key_test() ->
+    Pem = ecdsa_private_with_params(),
+    Key = jwt:pem_to_key(Pem),
+    ?assert(is_record(Key, 'ECPrivateKey')).
 
 %%
 %% Helpers
@@ -210,6 +215,9 @@ rsa_secret() ->
 ecdsa_private_key() ->
     from_pem_file("./test/pem/ecdsa_private.pem").
 
+ecdsa_private_with_params() ->
+    from_pem_file("./test/pem/ecdsa_private_with_params.pem").
+
 ecdsa_public_key() ->
     from_pem_file("./test/pem/ecdsa_public.pem").
 

diff --git a/test/pem/ecdsa_private_with_params.pem b/test/pem/ecdsa_private_with_params.pem
@@ -0,0 +1,8 @@
+-----BEGIN EC PARAMETERS-----
+BggqhkjOPQMBBw==
+-----END EC PARAMETERS-----
+-----BEGIN EC PRIVATE KEY-----
+MHcCAQEEIFilDgQ4JI27amkUh2DhgtsDCn0qrs4Ll9WRv1EstNX3oAoGCCqGSM49
+AwEHoUQDQgAEC7TQXHee2nwrRH/heAXKwvKqev83xFnRP8iImwxO5RsYOe1kT5mW
+FywRgeEStB6eVxahfDJCS35jDBF46Akm6Q==
+-----END EC PRIVATE KEY-----