Fix wrap_cryptopro's sbox handling

[pygost.git] / pygost / wrap.py

diff --git a/pygost/wrap.py b/pygost/wrap.py
index 301023eda18228d35ca1b00d2916afc30495e30a..eb3855fb8ce3d7f25c18f01ae53c61df610f1783 100644 (file)
--- a/pygost/wrap.py
+++ b/pygost/wrap.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 # PyGOST -- Pure Python GOST cryptographic functions library
-# Copyright (C) 2015-2020 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2015-2022 Sergey Matveev <stargrave@stargrave.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -79,7 +79,12 @@ def wrap_cryptopro(ukm, kek, cek, sbox=DEFAULT_SBOX):
     :returns: wrapped key
     :rtype: bytes, 44 bytes
     """
-    return wrap_gost(ukm, diversify(kek, bytearray(ukm)), cek, sbox=sbox)
+    return wrap_gost(
+        ukm,
+        diversify(kek, bytearray(ukm), sbox=sbox),
+        cek,
+        sbox=sbox,
+    )
 
 
 def unwrap_cryptopro(kek, data, sbox=DEFAULT_SBOX):
@@ -143,5 +148,5 @@ def kimp15(encrypter_key, encrypter_mac, bs, kexp, iv):
     key_and_key_mac = ctr(encrypter_key, bs, kexp, iv)
     key, key_mac = key_and_key_mac[:-bs], key_and_key_mac[-bs:]
     if not compare_digest(mac(encrypter_mac, bs, iv + key), key_mac):
-        raise ValueError("invalid authentication tag")
+        raise ValueError("Invalid authentication tag")
     return key