addressed review comments

add file header

fix wc_RsaSSL_Verify

Author: miyazakh

embedded/signature/README.md

@@ -1,6 +1,6 @@
 # Signature Examples for Embedded Systems
 ​
-This directory includes the following examples under the sub-directories.Each has a Makefile and source files to build and execute the example and a README to show how to build and Example output.
+This directory includes the following examples. Each subdirectory has a Makefile, source files, and a README to show how to build the example, along with expected example output.
 ​
 |Scheme|Directory|Description|
 |---|---|---|
@@ -12,7 +12,8 @@ This directory includes the following examples under the sub-directories.Each ha
 ||ecc_vfy_only_nonblock|verify signature with non-blocking|
 
 
-You can specify a target function of Simple example, Benchemark or Memory track program.It also has options for optimized code for MCU architectures such as Intel x86, ARM64 or a generic code by default, as well as Math library of Single Precision or TFM.
+When building each example, you can specify arguments to control the build.  Specify a target function to run either a simple example, benchmark, or memory tracking example. Specify an "arch" option to build optimized code for MCU architectures such as Intel x86, ARM64 or a generic code by default.  And specify a "math" option to choose an underlying wolfCrypt math library to use, between Single Precision or TFM.
+
 
 ```
 $ make <Function> math=<Mathlib> arch=<MCU>
@@ -30,7 +31,7 @@ $ make <Function> math=<Mathlib> arch=<MCU>
 |math|Description|
 |---|---|
 |Default|Generic architecture by pure C language source code|
-|sp| SP for generic or specified  archtecture|
+|sp| SP for generic or specified  architecture|
 |tfm|TFM for generic architecture|
 ## MCU Architectures
 NOTE:  No architecture specification is required when using TFM.
@@ -43,10 +44,10 @@ NOTE:  No architecture specification is required when using TFM.
 |x64|SP for x86 64bit|
 
 
-The Makefile is self-contained without libwolfssl. Put your wolfSSL source filesin parallel with wolfssl-examples directory. It is defined by WOLFROOT in Makefile.It compiles only needed files for the target. OBJ and OBJ_xxx macro in Makefiledefine object files for the common and specific target.
-​
-Example programs are hard coded for a hash algorithm or signature scheme.Sha256 is for the hash by default. PKCS #1 v1.5 or ECDSA for the signature scheme.You can refer to the following API tables for modifying the examples for other algorithms or schemes.
+Each Makefile is self-contained to statically link wolfCrypt source files (without using a shared libwolfssl.so). Put your wolfSSL source files in parallel with the wolfssl-examples directory. The location of the primary wolfSSL source directory is defined by WOLFROOT in each Makefile. Each build compiles only the needed files for the target. OBJ and OBJ_xxx macros in each Makefile define object files for the common and specific target.
 ​
+Example programs are hard coded to use a specific hash algorithm or signature scheme. Sha256 is used for the hash by default. PKCS#1 v1.5 or ECDSA is used for the signature scheme. You can refer to the following API tables for modifying the examples for other algorithms or schemes.
+
 ## Table 1: Hash algorithms for PKCS#1 Signature
 |Algorithm|Src File|Macro SW<br>Enable|<br>Disable|Note|
 |---|---|---|---|---|

embedded/signature/ecc_sign_verify/ecc_sign_verify.c

@@ -1,6 +1,6 @@
 /* ecc_sign_verify.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
@@ -27,9 +27,7 @@
 #include <wolfssl/wolfcrypt/hash.h>
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
-#include<wolfssl/test.h>
-
-
+#include <wolfssl/test.h>
 
 /* uncomment to show signatures */
 /* #define SHOW_SIGS_IN_EXAMPLE */
@@ -91,7 +89,6 @@ int ecc_sign_verify(void)
     ret = do_sig_ver_test(ECC_KEY_SIZE_521);
     CHECK_RET(ret, 0, finished, "521 test");
 
-
 finished:
 #ifdef DEBUG_MEMORY
     printf("\n");
@@ -117,15 +114,12 @@ int do_sig_ver_test(int eccKeySz)
     WC_RNG rng;
     int verified = 0;
 
-
 /* Variables for Benchmark */
 double start_time, total_time;
 #ifndef BENCH_TIME_SEC
     #define BENCH_TIME_SEC 1
 #endif
     int count;
-
-
     /*
      * for odd curve sizes account for mod EG:
      * Case 1) curve field of 256:
@@ -152,10 +146,6 @@ double start_time, total_time;
         printf("Failed to allocate sig buff\n");
         return -1001;
     }
-
-
-
-
     ret = wc_InitRng(&rng);
     CHECK_RET(ret, 0, key_done, "wc_InitRng()");
 
@@ -179,22 +169,16 @@ double start_time, total_time;
 
         ret = wc_ecc_verify_hash(sig, maxSigSz, hash, sizeof(hash),
                                                             &verified, &key);
-
-
         CHECK_RET(ret, 0, rng_done, "wc_ecc_verify_hash()");
         CHECK_RET(verified, 1, rng_done, "verification check");
         verified = 0;
         maxSigSz = ECC_MAX_SIG_SIZE;
 #ifdef BENCHMARK
         count++;
     }
-
     printf("ECC Key Size %d     %9.2f Cycles/sec\n", eccKeySz, count/total_time);
-
 #else
-
-printf("Successfully verified signature w/ ecc key size %d!\n", eccKeySz);
-
+    printf("Successfully verified signature w/ ecc key size %d!\n", eccKeySz);
 #endif
 
 rng_done:
@@ -222,8 +206,8 @@ static void hexdump(const void *buffer, word32 len, byte cols)
 }
 #endif
 
-
-int main(){
+int main()
+{
 #ifdef BENCHMARK
     printf("---------------------------------------------------------------\n");
 #if defined(SP_C64_FLAG)

embedded/signature/ecc_sign_verify/user_settings.h

@@ -7,7 +7,6 @@
 #define NO_SHA
 
 /* rsa */
-#define WOLFSSL_RSA_VERIFY_INLINE
 #define WC_NO_RSA_OAEP
 #define WC_NO_HARDEN
 #define NO_RSA

embedded/signature/ecc_vfy_only/ecc_verify.c

@@ -1,6 +1,6 @@
 /* ecc_verify.c
  *
- * Copyright (C) 2006-2024 wolfSSL Inc.
+ * Copyright (C) 2006-2025 wolfSSL Inc.
  *
  * This file is part of wolfSSL. (formerly known as CyaSSL)
  *
@@ -27,10 +27,9 @@
 #include <wolfssl/wolfcrypt/hash.h>
 #include <wolfssl/wolfcrypt/logging.h>
 #include <wolfssl/wolfcrypt/error-crypt.h>
-#include<wolfssl/test.h>
+#include <wolfssl/test.h>
 #include "signature.h"
 
-
 #define HEAP_HINT NULL
 #define ECC_KEY_SIZE_112 112
 #define ECC_KEY_SIZE_128 128
@@ -45,10 +44,8 @@
 #define ECC_KEY_SIZE_521 521
 #define BYTE_SZ 8
 
-
 int idx_key(int keysize);
 
-
 #define CHECK_RET(a, b, eLabel, msg) { \
                                         if (a != b) {                    \
                                             printf("failed %s\n", msg);  \
@@ -59,7 +56,6 @@ int idx_key(int keysize);
 
 int do_sig_ver_test(int eccKeySz);
 
-
 int ecc_verify(void)
 {
     int ret = 0;
@@ -90,7 +86,6 @@ int ecc_verify(void)
     ret = do_sig_ver_test(ECC_KEY_SIZE_521);
     CHECK_RET(ret, 0, finished, "521 test");
 
-
 finished:
 #ifdef DEBUG_MEMORY
     printf("\n");
@@ -119,15 +114,12 @@ int do_sig_ver_test(int eccKeySz)
     int key_size;
     unsigned char *pKeybuff;
 
-
 /* Variables for Benchmark */
-double start_time, total_time;
+    double start_time, total_time;
+    int count;
 #ifndef BENCH_TIME_SEC
     #define BENCH_TIME_SEC 1
 #endif
-    int count;
-
-
     /*
      * for odd curve sizes account for mod EG:
      * Case 1) curve field of 256:
@@ -148,22 +140,19 @@ double start_time, total_time;
     printf("Key size is %d, byteField = %d\n", eccKeySz, byteField);
 #endif
 
-
     ret = wc_InitRng(&rng);
     CHECK_RET(ret, 0, key_done, "wc_InitRng()");
 
 #ifdef BENCHMARK
     count = 0;
     start_time = current_time(1);
 
-    while( (double)BENCH_TIME_SEC > (total_time = current_time(0) - start_time ) ){
+    while((double)BENCH_TIME_SEC > (total_time = current_time(0) - start_time)){
 #endif
         ret = wc_ecc_init(&key);
         CHECK_RET(ret, 0, sig_done, "wc_ecc_init()");
 
-
-    /* Import signature and ecc_key */
-
+        /* Import signature and ecc_key */
         sig = sig_keys[idx_key(eccKeySz)].sig;
         sig_size = sig_keys[idx_key(eccKeySz)].sig_size;
         pKeybuff = sig_keys[idx_key(eccKeySz)].pubkey;
@@ -172,24 +161,18 @@ double start_time, total_time;
         ret = wc_ecc_import_x963(pKeybuff, key_size, &key);
         CHECK_RET(ret, 0, rng_done, "wc_ecc_import_x963()");
 
-
         ret = wc_ecc_verify_hash(sig, sig_size, hash, sizeof(hash),
-                                                            &verified, &key);
-
+                                                                &verified, &key);
         CHECK_RET(ret, 0, rng_done, "wc_ecc_verify_hash()");
         CHECK_RET(verified, 1, rng_done, "verification check");
         verified = 0;
         maxSigSz = ECC_MAX_SIG_SIZE;
 #ifdef BENCHMARK
         count++;
     }
-
     printf("ECC Key Size %d     %9.2f Cycles/sec\n", eccKeySz, count/total_time);
-
 #else
-
-printf("Successfully verified signature w/ ecc key size %d!\n", eccKeySz);
-
+    printf("Successfully verified signature w/ ecc key size %d!\n", eccKeySz);
 #endif /* BENCHMARK */
 
 rng_done:
@@ -200,8 +183,8 @@ printf("Successfully verified signature w/ ecc key size %d!\n", eccKeySz);
     return ret;
 }
 
-
-int main(){
+int main()
+{
 #ifdef BENCHMARK
     printf("---------------------------------------------------------------\n");
 #if defined(SP_C64_FLAG)
@@ -253,6 +236,4 @@ int idx_key(int keysize){
         default:
             return -1;
     }
-
 }
-

embedded/signature/ecc_vfy_only/user_settings.h

@@ -7,7 +7,6 @@
 #define NO_SHA
 
 /* rsa */
-#define WOLFSSL_RSA_VERIFY_INLINE
 #define WC_NO_RSA_OAEP
 #define WC_NO_HARDEN
 #define NO_RSA

embedded/signature/ecc_vfy_only_nonblock/ecc_pubKey.h

@@ -1,3 +1,23 @@
+/* ecc_pubkey.h
+ *
+ * Copyright (C) 2006-2025 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL. (formerly known as CyaSSL)
+ *
+ * wolfSSL is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * wolfSSL is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
 unsigned char ecc_PublicKey_112[] = {
     0x04, 0x67, 0xa6, 0xdc, 0x12, 0x25, 0xdb, 0x81,
     0x5c, 0x67, 0x7c, 0xbf, 0x55, 0x3b, 0xd9, 0x51,
@@ -9,7 +29,7 @@ unsigned char ecc_PublicKey_112[] = {
     0xad,
 };
 
-unsigned char ecc_PublicKey_128[] = {    
+unsigned char ecc_PublicKey_128[] = {
     0x04, 0x0f, 0x31, 0xea, 0x92, 0x1d, 0x84, 0xcf,
     0xce, 0xe1, 0xe5, 0x0b, 0x13, 0xda, 0xd3, 0xb2,
     0xb0, 0x57, 0x0c, 0x02, 0xdb, 0x50, 0xaa, 0xaa,