moepman/acertmgr
1
0
Fork 0
mirror of https://github.com/moepman/acertmgr.git synced 2024-12-28 19:31:55 +01:00
Code Releases Activity

tools: use cryptography conversion instead of custom function

Browse Source 
Use cryptography's int_to_bytes consistently instead of our own number
to byte conversion function
This commit is contained in:
Kishi85 2019-04-15 18:14:14 +02:00
parent 4df74d67d5
commit 88d4a52ab9
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
acertmgr/tools.py
View File

@ -7,7 +7,6 @@
# available under the ISC license, see LICENSE # available under the ISC license, see LICENSE
import base64 import base64
import binascii
import datetime import datetime
import io import io
import os import os
@ -19,8 +18,8 @@ from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import hashes, serialization from cryptography.hazmat.primitives import hashes, serialization
from cryptography.hazmat.primitives.asymmetric import rsa, ec, padding from cryptography.hazmat.primitives.asymmetric import rsa, ec, padding
from cryptography.hazmat.primitives.asymmetric.utils import decode_dss_signature from cryptography.hazmat.primitives.asymmetric.utils import decode_dss_signature
from cryptography.x509.oid import NameOID, ExtensionOID
from cryptography.utils import int_to_bytes from cryptography.utils import int_to_bytes
from cryptography.x509.oid import NameOID, ExtensionOID
try: try:
from urllib.request import urlopen, Request # Python 3 from urllib.request import urlopen, Request # Python 3
@ -241,8 +240,8 @@ def get_key_alg_and_jwk(key):
# See https://tools.ietf.org/html/rfc7518#section-6.3 # See https://tools.ietf.org/html/rfc7518#section-6.3
numbers = key.public_key().public_numbers() numbers = key.public_key().public_numbers()
return "RS256", {"kty": "RSA", return "RS256", {"kty": "RSA",
"e": bytes_to_base64url(number_to_byte_format(numbers.e)), "e": bytes_to_base64url(int_to_bytes(numbers.e)),
"n": bytes_to_base64url(number_to_byte_format(numbers.n))} "n": bytes_to_base64url(int_to_bytes(numbers.n))}
elif isinstance(key, ec.EllipticCurvePrivateKey): elif isinstance(key, ec.EllipticCurvePrivateKey):
# See https://tools.ietf.org/html/rfc7518#section-6.2 # See https://tools.ietf.org/html/rfc7518#section-6.2
numbers = key.public_key().public_numbers() numbers = key.public_key().public_numbers()
@ -302,15 +301,6 @@ def bytes_to_base64url(b):
return base64.urlsafe_b64encode(b).decode('utf8').replace("=", "") return base64.urlsafe_b64encode(b).decode('utf8').replace("=", "")
# @brief convert numbers to byte-string
# @param num number to convert
# @return byte-string containing the number
def number_to_byte_format(num):
n = format(num, 'x')
n = "0{0}".format(n) if len(n) % 2 else n
return binascii.unhexlify(n)
# @brief check whether existing target file is still valid or source crt has been updated # @brief check whether existing target file is still valid or source crt has been updated
# @param target string containing the path to the target file # @param target string containing the path to the target file
# @param file string containing the path to the certificate file # @param file string containing the path to the certificate file