Merge pull request randombit#4293 from Rohde-Schwarz/fix/bsi-policy-d…

…epr-mod Fix: Deprecated Module in BSI Policy
Rohde-Schwarz · Aug 8, 2024 · e0a3ed6 · e0a3ed6
2 parents f3e5744 + b415a68
commit e0a3ed6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/src/build-data/policy/bsi.txt b/src/build-data/policy/bsi.txt
@@ -36,7 +36,6 @@ emsa_pssr
 iso9796
 
 # pubkey
-dlies
 dh
 #dilithium // not (yet) recommended
 #dilithium_aes // not (yet) recommended

diff --git a/src/lib/pubkey/ec_group/ec_point.h b/src/lib/pubkey/ec_group/ec_point.h
@@ -223,6 +223,7 @@ class BOTAN_PUBLIC_API(2, 0) EC_Point final {
 #if defined(BOTAN_DISABLE_DEPRECATED_FEATURES)
 
    private:
+      friend class EC_Mul2Table_Data_BN;
 #endif
 
       /**

diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py
@@ -215,7 +215,7 @@ def sanitize_kv(some_string):
 
     if target in ['bsi', 'nist']:
         # tls is optional for bsi/nist but add it so verify tests work with these minimized configs
-        flags += ['--module-policy=%s' % (target), '--enable-modules=tls12']
+        flags += ['--module-policy=%s' % (target), '--enable-modules=tls12', '--disable-deprecated-features']
 
     if target in ['docs']:
         flags += ['--with-doxygen', '--with-sphinx', '--with-rst2man']
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,6 @@ emsa_pssr @@
     iso9796
     # pubkey
-    dlies
     dh
     #dilithium // not (yet) recommended
     #dilithium_aes // not (yet) recommended
@@ Expand Down @@