afalg_engine: adapt to new engine build config

This adapts the package to the new include/openssl-module.mk, and
updated runtime configuration.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>

diff --git a/libs/afalg_engine/Config.in b/libs/afalg_engine/Config.in
index ed67f52039dc48b996f281c5ac14939474d3a296..a81a892e901fa4554ded807169e3cf48aabc01b8 100644 (file)
--- a/libs/afalg_engine/Config.in
+++ b/libs/afalg_engine/Config.in
@@ -9,19 +9,6 @@ if PACKAGE_libopenssl-afalg_sync
            This increases memory usage, and has problems when process fork
            with open digest contexts (openssh will not work because of it).
 
-    config AFALG_FALLBACK
-       bool "Enable software fallback feature"
-       default y
-       help
-           Use software to fulfill small requests.  Using AF_ALG adds latency,
-           which makes it slow to perform small requests.  Enabling this
-           option overcomes this problem, at the cost of increased memory
-           and CPU usage.  This is a new, experimental feature; if you
-           encounter any problem, this is the first option to disable.
-           The fallback will fail if you enable this engine alongside
-           devcrypto, so you'll not be able to install both at the same
-           time if this option is enabled.
-
     config AFALG_UPDATE_CTR_IV
        bool "Don't rely on kernel to update CTR IV"
        default y

diff --git a/libs/afalg_engine/Makefile b/libs/afalg_engine/Makefile
index 2dc5af7a161eef779079744da945025fbd5bf894..a227c079f6a95d261e132b27367795880869ed4d 100644 (file)
--- a/libs/afalg_engine/Makefile
+++ b/libs/afalg_engine/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=afalg_engine
 PKG_VERSION:=1.2.0-beta.1
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/cotequeiroz/afalg_engine/archive/v$(PKG_VERSION)
@@ -25,7 +25,7 @@ PKG_CONFIG_DEPENDS:= \
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include $(INCLUDE_DIR)/openssl-engine.mk
+include $(INCLUDE_DIR)/openssl-module.mk
 
 $(eval $(call Package/openssl/add-engine,afalg,libopenssl-afalg_sync))
 define Package/libopenssl-afalg_sync
@@ -33,7 +33,7 @@ define Package/libopenssl-afalg_sync
     TITLE:=AF_ALG engine using sync crypto API
     URL:=https://github.com/cotequeiroz/afalg_engine
     DEPENDS += @!OPENSSL_ENGINE_BUILTIN_AFALG +kmod-crypto-user
-    CONFLICTS:=libopenssl-afalg $(if $(CONFIG_AFALG_FALLBACK),libopenssl-devcrypto)
+    CONFLICTS:=libopenssl-afalg
     MENU:=1
 endef
 
@@ -54,7 +54,6 @@ endef
 CMAKE_OPTIONS += \
        -DOPENSSL_ENGINES_DIR=/usr/lib/$(ENGINES_DIR) \
        -DDIGESTS=$(if $(CONFIG_AFALG_DIGESTS),ON,OFF) \
-       -DFALLBACK=$(if $(CONFIG_AFALG_FALLBACK),ON,OFF) \
        -DUPDATE_CTR_IV=$(if $(CONFIG_AFALG_UPDATE_CTR_IV),ON,OFF) \
        -DUSE_ZERO_COPY=$(if $(CONFIG_AFALG_ZERO_COPY),ON,OFF)
 

diff --git a/libs/afalg_engine/files/afalg.cnf b/libs/afalg_engine/files/afalg.cnf
index f17338b8877375bf21813f99f89d65b10c12204c..82f0cfadf86360051361441249298047e54a5752 100644 (file)
--- a/libs/afalg_engine/files/afalg.cnf
+++ b/libs/afalg_engine/files/afalg.cnf
@@ -1,4 +1,4 @@
-[afalg]
+[afalg_sect]
 # Leave this alone and configure algorithms with CIPERS/DIGESTS below
 default_algorithms = ALL