Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #15245 from neheb/gost

Browse source 
gost_engine: fix compilation without deprecated OpenSSL APIs
This commit is contained in:
Rosen Penev 2021-03-25 10:47:45 -07:00 committed by GitHub
commit fdd696b6ce
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/gost_engine/Makefile
View file

@ -12,7 +12,7 @@ PKG_MAINTAINER:=Artur Petrov <github@phpchain.ru>
PKG_LICENSE:=OpenSSL
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/cmake.mk
include ../../devel/ninja/ninja-cmake.mk
PKG_UNPACK:=$(HOST_TAR) -C "$(PKG_BUILD_DIR)" --strip-components=1 -xzf "$(DL_DIR)/$(PKG_SOURCE)"
PKG_INSTALL:=

11
libs/gost_engine/patches/010-openssl-deprecated.patch Normal file
View file

@ -0,0 +1,11 @@
--- a/gost_pmeth.c
+++ b/gost_pmeth.c
@@ -608,7 +608,7 @@ static int pkey_gost_mac_ctrl_str(EVP_PK
if (strcmp(type, hexkey_ctrl_string) == 0) {
long keylen;
int ret;
- unsigned char *keybuf = string_to_hex(value, &keylen);
+ unsigned char *keybuf = OPENSSL_hexstr2buf(value, &keylen);
if (!keybuf || keylen != 32) {
GOSTerr(GOST_F_PKEY_GOST_MAC_CTRL_STR,
GOST_R_INVALID_MAC_KEY_LENGTH);