Sbox/curve parameters names comply with OIDs

[pygost.git] / pygost / gost341194.py

diff --git a/pygost/gost341194.py b/pygost/gost341194.py
index aa3cf519827e95f4063ee56c20051607fa4812a2..21ebb15e2acf49de13b25ee5ac28a7b1cacf3b5d 100644 (file)
--- a/pygost/gost341194.py
+++ b/pygost/gost341194.py
@@ -1,6 +1,6 @@
 # coding: utf-8
 # PyGOST -- Pure Python GOST cryptographic functions library
-# Copyright (C) 2015-2017 Sergey Matveev <stargrave@stargrave.org>
+# Copyright (C) 2015-2019 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
@@ -21,6 +21,7 @@ taken according to specification's terminology.
 """
 
 from copy import copy
+from functools import partial
 from struct import pack
 
 from pygost.gost28147 import addmod
@@ -29,15 +30,14 @@ from pygost.gost28147 import encrypt
 from pygost.gost28147 import ns2block
 from pygost.gost28147 import validate_sbox
 from pygost.iface import PEP247
-from pygost.utils import bytes2long
+from pygost.pbkdf2 import pbkdf2 as pbkdf2_base
 from pygost.utils import hexdec
 from pygost.utils import hexenc
-from pygost.utils import long2bytes
 from pygost.utils import strxor
 from pygost.utils import xrange  # pylint: disable=redefined-builtin
 
 
-DEFAULT_SBOX = "GostR3411_94_TestParamSet"
+DEFAULT_SBOX = "id-GostR3411-94-CryptoProParamSet"
 BLOCKSIZE = 32
 C2 = 32 * b"\x00"
 C3 = hexdec(b"ff00ffff000000ffff0000ff00ffff0000ff00ff00ff00ffff00ff00ff00ff00")
@@ -187,34 +187,8 @@ def new(data=b"", sbox=DEFAULT_SBOX):
     return GOST341194(data, sbox)
 
 
-# This implementation is based on Python 3.5.2 source code's one.
-# PyGOST does not register itself in hashlib anyway, so use it instead.
-def pbkdf2(password, salt, iterations, dklen):
-    """PBKDF2 implementation for GOST R 34.11-94
+PBKDF2_HASHER = partial(GOST341194, sbox="id-GostR3411-94-CryptoProParamSet")
 
-    Based on http://tc26.ru/methods/containers_v1/Addition_to_PKCS5_v1_0.pdf
-    """
-    inner = GOST341194(sbox="GostR3411_94_CryptoProParamSet")
-    outer = GOST341194(sbox="GostR3411_94_CryptoProParamSet")
-    password = password + b"\x00" * (inner.block_size - len(password))
-    inner.update(strxor(password, len(password) * b"\x36"))
-    outer.update(strxor(password, len(password) * b"\x5C"))
-
-    def prf(msg):
-        icpy = inner.copy()
-        ocpy = outer.copy()
-        icpy.update(msg)
-        ocpy.update(icpy.digest())
-        return ocpy.digest()
-
-    dkey = b''
-    loop = 1
-    while len(dkey) < dklen:
-        prev = prf(salt + long2bytes(loop, 4))
-        rkey = bytes2long(prev)
-        for _ in xrange(iterations - 1):
-            prev = prf(prev)
-            rkey ^= bytes2long(prev)
-        loop += 1
-        dkey += long2bytes(rkey, inner.digest_size)
-    return dkey[:dklen]
+
+def pbkdf2(password, salt, iterations, dklen):
+    return pbkdf2_base(PBKDF2_HASHER, password, salt, iterations, dklen)