Merge pull request wolfSSL#504 from philljj/no_asn_build

user_settings: default to NO_ASN if NO_RSA defined.
philljj · Sep 13, 2024 · 7609abf · 7609abf
2 parents 080dae0 + f975dbe
commit 7609abf
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 16 deletions.
diff --git a/.github/workflows/test-renode-fastmath-smallstack.yml b/.github/workflows/test-renode-fastmath-smallstack.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -51,7 +51,7 @@ jobs:
 
 
       - name: Upload Output Dir
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Renode Test Results
           path: test_results/

diff --git a/.github/workflows/test-renode-noasm-smallstack.yml b/.github/workflows/test-renode-noasm-smallstack.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -51,7 +51,7 @@ jobs:
 
 
       - name: Upload Output Dir
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Renode Test Results
           path: test_results/

diff --git a/.github/workflows/test-renode-noasm.yml b/.github/workflows/test-renode-noasm.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -60,7 +60,7 @@ jobs:
 
 
       - name: Upload Output Dir
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Renode Test Results
           path: test_results/

diff --git a/.github/workflows/test-renode-nrf52.yml b/.github/workflows/test-renode-nrf52.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -82,7 +82,7 @@ jobs:
 
 
       - name: Upload Output Dir
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Renode Test Results
           path: test_results/

diff --git a/.github/workflows/test-renode-sha3.yml b/.github/workflows/test-renode-sha3.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -64,7 +64,7 @@ jobs:
 
 
       - name: Upload Output Dir
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Renode Test Results
           path: test_results/
diff --git a/.github/workflows/test-renode-sha384.yml b/.github/workflows/test-renode-sha384.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -63,7 +63,7 @@ jobs:
 
 
       - name: Upload Output Dir
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Renode Test Results
           path: test_results/

diff --git a/.github/workflows/test-renode-smallstack.yml b/.github/workflows/test-renode-smallstack.yml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: true
 
@@ -66,7 +66,7 @@ jobs:
 
 
       - name: Upload Output Dir
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: Renode Test Results
           path: test_results/

diff --git a/include/user_settings.h b/include/user_settings.h
@@ -366,8 +366,7 @@ extern int tolower(int c);
 #   define WC_NO_HASHDRBG
 #   define NO_DEV_RANDOM
 #   define NO_ECC_KEY_EXPORT
-#   if defined(NO_RSA) && !defined(WOLFSSL_HAVE_XMSS) && \
-       !defined(WOLFSSL_HAVE_LMS)
+#   if defined(NO_RSA)
 #       define NO_ASN
 #   endif
 #endif