From cbc59253d79c718ecaaf1e7eacf0fd7fed940925 Mon Sep 17 00:00:00 2001 From: Jakob Schlyter Date: Tue, 11 Jan 2022 13:53:11 +0100 Subject: [PATCH 1/2] - generate symmetric key using new_sym_key - add "oct" as synonym to SYM --- src/cryptojwt/tools/keygen.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cryptojwt/tools/keygen.py b/src/cryptojwt/tools/keygen.py index 7ae8e304..efba663f 100644 --- a/src/cryptojwt/tools/keygen.py +++ b/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,12 @@ 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) + if args.kid: + jwk.kid = args.kid else: print("Unknown key type: {}".format(args.kty), file=sys.stderr) exit(1) From 994e52c8f7e695c392506483da3055c935c5c78c Mon Sep 17 00:00:00 2001 From: Jakob Schlyter Date: Tue, 11 Jan 2022 14:04:37 +0100 Subject: [PATCH 2/2] simplify --- src/cryptojwt/tools/keygen.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/cryptojwt/tools/keygen.py b/src/cryptojwt/tools/keygen.py index efba663f..558a6673 100644 --- a/src/cryptojwt/tools/keygen.py +++ b/src/cryptojwt/tools/keygen.py @@ -54,9 +54,7 @@ def main(): elif args.kty.upper() == "SYM" or args.kty.upper() == "OCT": if args.keysize is None: args.keysize = DEFAULT_SYM_KEYSIZE - jwk = new_sym_key(bytes=args.keysize) - if args.kid: - jwk.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)