deon/gnuk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tool/kdf_calc.py.

Browse Source
This commit is contained in:
NIIBE Yutaka
2018-11-09 20:52:15 +09:00
parent becf8fabc5
commit 3d37003d8c
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,3 +1,7 @@
2018-11-09 NIIBE Yutaka <gniibe@fsij.org>
* tool/kdf_calc.py (kdf_calc): Use libgcrypt.so.20.
2018-11-09 NIIBE Yutaka <gniibe@fsij.org> 2018-11-09 NIIBE Yutaka <gniibe@fsij.org>
* src/openpgp.c (cmd_pso, cmd_internal_authenticate): Use * src/openpgp.c (cmd_pso, cmd_internal_authenticate): Use

2
tool/kdf_calc.py
View File

@@ -36,7 +36,7 @@ GCRY_MD_SHA256 = 8
def kdf_calc(pw_string, salt_byte, iterations): def kdf_calc(pw_string, salt_byte, iterations):
ffi = FFI() ffi = FFI()
ffi.cdef(DEF_gcry_kdf_derive) ffi.cdef(DEF_gcry_kdf_derive)
libgcrypt = ffi.dlopen("libgcrypt.so") libgcrypt = ffi.dlopen("libgcrypt.so.20")
if isinstance(pw_string, str): if isinstance(pw_string, str):
pw_byte = pw_string.encode('UTF-8') pw_byte = pw_string.encode('UTF-8')
else: else: