Merge pull request #105 from IdentityPython/keygen_oct

Symmetric key generation improvements

Author: rohe

src/cryptojwt/tools/keygen.py

@@ -3,12 +3,11 @@
 """JSON Web Key (JWK) Generator"""
 import argparse
 import json
-import os
 import sys
 
 from cryptojwt.jwk.ec import NIST2SEC
 from cryptojwt.jwk.ec import new_ec_key
-from cryptojwt.jwk.hmac import SYMKey
+from cryptojwt.jwk.hmac import new_sym_key
 from cryptojwt.jwk.rsa import new_rsa_key
 from cryptojwt.utils import b64e
 
@@ -52,11 +51,10 @@ def main():
             print("Unknown curve: {0}".format(args.crv), file=sys.stderr)
             exit(1)
         jwk = new_ec_key(crv=args.crv, kid=args.kid)
-    elif args.kty.upper() == "SYM":
+    elif args.kty.upper() == "SYM" or args.kty.upper() == "OCT":
         if args.keysize is None:
             args.keysize = DEFAULT_SYM_KEYSIZE
-        randomkey = os.urandom(args.keysize)
-        jwk = SYMKey(key=randomkey, kid=args.kid)
+        jwk = new_sym_key(bytes=args.keysize, kid=args.kid)
     else:
         print("Unknown key type: {}".format(args.kty), file=sys.stderr)
         exit(1)