Skip to content

Symmetric key generation improvements #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/cryptojwt/tools/keygen.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down