RSA+DSA+ECC export_key_jwk produces canonical JSON

DCIT · Apr 25, 2016 · 33a6c68 · 33a6c68 · FGasper · Apr 25, 2016
1 parent 3a53c9e
commit 33a6c68
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -18,6 +18,7 @@ TODO:
 0.031   2016/04/XX
         - RSA+DSA public key export now produces PEM/DER compatible with openssl
                   public keys exported be previous version can still be imported
+        - RSA+DSA+ECC export_key_jwk produces canonical JSON
 
 0.030   2016/04/13
         - fix: 0.029 + 0.028 by mistake installed *.inc files to perl/(lib|site|vendor)

diff --git a/lib/CryptX.pm b/lib/CryptX.pm
@@ -39,7 +39,12 @@ sub _decode_json {
 
 sub _encode_json {
   croak "FATAL: cannot find JSON::PP or JSON::XS or Cpanel::JSON::XS" if !$has_json;
-  encode_json(shift);
+  my $data = shift;
+  my $rv = encode_json($data); # non-canonical fallback
+  return(eval { Cpanel::JSON::XS->new->canonical->encode($data) } || $rv) if $has_json == 1;
+  return(eval { JSON::XS->new->canonical->encode($data)         } || $rv) if $has_json == 2;
+  return(eval { JSON::PP->new->canonical->encode($data)         } || $rv) if $has_json == 3;
+  return($rv);
 }
 
 1;