Update code to v1.0.14 (10)

2026-05-20 16:35:47 +08:00 · 2024-02-29 19:35:00 +08:00
parent c2ee3b694c
commit a956d26f6d
3188 changed files with 2317293 additions and 146 deletions
--- a/android/extern/wolfssl/wolfcrypt/benchmark/README.md
+++ b/android/extern/wolfssl/wolfcrypt/benchmark/README.md
@@ -0,0 +1,103 @@
+# wolfCrypt Benchmarks
+
+Tool for performing cryptographic algorithm benchmarking.
+
+## Measurements
+
+* Symmetric algorithms like AES and ChaCha20 are measured in Killobytes (KB) or Megabytes (MB) per second.
+* Asymmetric algorithms like RSA and ECC are measured using Operations Per Second (Ops) per second.
+
+## Usage
+
+```sh
+./wolfcrypt/benchmark/benchmark -?
+benchmark
+-? <num>    Help, print this usage
+            0: English, 1: Japanese
+-csv        Print terminal output in csv format
+-base10     Display bytes as power of 10 (eg 1 kB = 1000 Bytes)
+-no_aad     No additional authentication data passed.
+-dgst_full  Full digest operation performed.
+-rsa_sign   Measure RSA sign/verify instead of encrypt/decrypt.
+<keySz> -rsa-sz
+            Measure RSA <key size> performance.
+-<alg>      Algorithm to benchmark. Available algorithms include:
+              cipher aes-cbc aes-gcm aes-ecb aes-xts aes-cfb aes-ctr aes-ccm
+              camellia arc4 chacha20 chacha20-poly1305 des
+              digest md5 poly1305 sha sha2 sha224 sha256 sha384 sha512 sha3
+              sha3-224 sha3-256 sha3-384 sha3-512 ripemd
+              mac cmac hmac hmac-md5 hmac-sha hmac-sha224 hmac-sha256
+              hmac-sha384 hmac-sha512 pbkdf2
+              asym rsa-kg rsa rsa-sz dh ecc-kg ecc ecc-enc curve25519_kg x25519
+              ed25519-kg ed25519
+              other rng scrypt
+-lng <num>  Display benchmark result by specified language.
+            0: English, 1: Japanese
+<num>       Size of block in bytes
+```
+
+The `-base10` option shows as thousands of bytes (kB).
+
+## Example Output
+
+Run on Intel(R) Core(TM) i7-7920HQ CPU @ 3.10GHz.
+
+```sh
+./configure --enable-intelasm --enable-aesni --enable-sp --enable-sp-asm && make
+
+./wolfcrypt/benchmark/benchmark
+------------------------------------------------------------------------------
+ wolfSSL version 4.0.0
+------------------------------------------------------------------------------
+wolfCrypt Benchmark (block bytes 1048576, min 1.0 sec each)
+RNG                180 MB took 1.022 seconds,  176.201 MB/s Cycles per byte =  16.76
+AES-128-CBC-enc   1250 MB took 1.002 seconds, 1247.878 MB/s Cycles per byte =   2.37
+AES-128-CBC-dec   4595 MB took 1.001 seconds, 4591.703 MB/s Cycles per byte =   0.64
+AES-192-CBC-enc   1005 MB took 1.003 seconds, 1002.018 MB/s Cycles per byte =   2.95
+AES-192-CBC-dec   4345 MB took 1.000 seconds, 4344.744 MB/s Cycles per byte =   0.68
+AES-256-CBC-enc    905 MB took 1.005 seconds,  900.386 MB/s Cycles per byte =   3.28
+AES-256-CBC-dec   3255 MB took 1.001 seconds, 3251.618 MB/s Cycles per byte =   0.91
+AES-128-GCM-enc   4730 MB took 1.001 seconds, 4726.267 MB/s Cycles per byte =   0.62
+AES-128-GCM-dec   5140 MB took 1.000 seconds, 5137.596 MB/s Cycles per byte =   0.57
+AES-192-GCM-enc   4475 MB took 1.001 seconds, 4471.056 MB/s Cycles per byte =   0.66
+AES-192-GCM-dec   3405 MB took 1.001 seconds, 3403.179 MB/s Cycles per byte =   0.87
+AES-256-GCM-enc   2640 MB took 1.000 seconds, 2638.905 MB/s Cycles per byte =   1.12
+AES-256-GCM-dec   2780 MB took 1.001 seconds, 2776.632 MB/s Cycles per byte =   1.06
+CHACHA            2615 MB took 1.000 seconds, 2614.357 MB/s Cycles per byte =   1.13
+CHA-POLY          1490 MB took 1.001 seconds, 1488.344 MB/s Cycles per byte =   1.98
+MD5                440 MB took 1.010 seconds,  435.763 MB/s Cycles per byte =   6.78
+POLY1305          4900 MB took 1.001 seconds, 4896.430 MB/s Cycles per byte =   0.60
+SHA                515 MB took 1.011 seconds,  509.459 MB/s Cycles per byte =   5.80
+SHA-224            425 MB took 1.005 seconds,  422.737 MB/s Cycles per byte =   6.98
+SHA-256            420 MB took 1.006 seconds,  417.312 MB/s Cycles per byte =   7.08
+SHA-384            615 MB took 1.003 seconds,  613.018 MB/s Cycles per byte =   4.82
+SHA-512            560 MB took 1.007 seconds,  556.230 MB/s Cycles per byte =   5.31
+SHA3-224           295 MB took 1.003 seconds,  294.133 MB/s Cycles per byte =  10.04
+SHA3-256           280 MB took 1.003 seconds,  279.088 MB/s Cycles per byte =  10.58
+SHA3-384           215 MB took 1.002 seconds,  214.654 MB/s Cycles per byte =  13.76
+SHA3-512           145 MB took 1.005 seconds,  144.266 MB/s Cycles per byte =  20.47
+HMAC-MD5           485 MB took 1.004 seconds,  483.019 MB/s Cycles per byte =   6.11
+HMAC-SHA           505 MB took 1.006 seconds,  502.159 MB/s Cycles per byte =   5.88
+HMAC-SHA224        415 MB took 1.007 seconds,  411.965 MB/s Cycles per byte =   7.17
+HMAC-SHA256        380 MB took 1.002 seconds,  379.398 MB/s Cycles per byte =   7.78
+HMAC-SHA384        610 MB took 1.006 seconds,  606.370 MB/s Cycles per byte =   4.87
+HMAC-SHA512        620 MB took 1.001 seconds,  619.377 MB/s Cycles per byte =   4.77
+RSA     2048 public      52000 ops took 1.001 sec, avg 0.019 ms, 51932.223 ops/sec
+RSA     2048 private      1700 ops took 1.022 sec, avg 0.601 ms, 1662.697 ops/sec
+DH      2048 key gen      3491 ops took 1.000 sec, avg 0.286 ms, 3490.745 ops/sec
+DH      2048 agree        3500 ops took 1.014 sec, avg 0.290 ms, 3452.191 ops/sec
+ECC      256 key gen     88961 ops took 1.000 sec, avg 0.011 ms, 88960.279 ops/sec
+ECDHE    256 agree       20700 ops took 1.005 sec, avg 0.049 ms, 20605.239 ops/sec
+ECDSA    256 sign        53200 ops took 1.001 sec, avg 0.019 ms, 53157.214 ops/sec
+ECDSA    256 verify      17200 ops took 1.004 sec, avg 0.058 ms, 17124.208 ops/sec
+Benchmark complete
+```
+
+
+## Windows Visual Studio
+
+For building wolfCrypt Benchmark project in Visual Studio open the `benchmark.sln`. For newer Visual Studio version it may prompt for a one-way upgrade. Then you may have to right-click on the solution and choose `Retarget solution` to update the project files for your Visual Studio version.
+
+If you see an error about `rc.exe` then you'll need to update the "Target Platform Version". You can do this by right-clicking on the benchmark project -> General -> "Target Platform Version" and changing to 8.1 (needs to match the wolfssl library project).
+
+This solution includes the wolfSSL library project at `<wolfssl-root>wolfssl.vcxproj` and will compile the library, then the benchmark project.
--- a/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.c
+++ b/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.c
--- a/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.h
+++ b/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.h
@@ -0,0 +1,131 @@
+/* wolfcrypt/benchmark/benchmark.h
+ *
+ * Copyright (C) 2006-2022 wolfSSL Inc.
+ *
+ * This file is part of wolfSSL.
+ *
+ * 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-1335, USA
+ */
+
+
+#ifndef WOLFCRYPT_BENCHMARK_H
+#define WOLFCRYPT_BENCHMARK_H
+
+
+#ifdef __cplusplus
+    extern "C" {
+#endif
+
+#include <wolfssl/wolfcrypt/types.h> /* Needed for 'byte' typedef */
+
+/* run all benchmark entry */
+#ifdef HAVE_STACK_SIZE
+THREAD_RETURN WOLFSSL_THREAD benchmark_test(void* args);
+#else
+int benchmark_test(void *args);
+#endif
+#ifndef NO_MAIN_DRIVER
+int wolfcrypt_benchmark_main(int argc, char** argv);
+#endif
+
+/* individual benchmarks */
+int  benchmark_init(void);
+int  benchmark_free(void);
+void benchmark_configure(int block_size);
+
+void bench_des(int useDeviceID);
+void bench_arc4(int useDeviceID);
+void bench_chacha(void);
+void bench_chacha20_poly1305_aead(void);
+void bench_aescbc(int useDeviceID);
+void bench_aesgcm(int useDeviceID);
+void bench_gmac(void);
+void bench_aesccm(int useDeviceID);
+void bench_aesecb(int useDeviceID);
+void bench_aesxts(void);
+void bench_aesctr(void);
+void bench_aescfb(void);
+void bench_aesofb(void);
+void bench_aessiv(void);
+void bench_poly1305(void);
+void bench_camellia(void);
+void bench_md5(int useDeviceID);
+void bench_sha(int useDeviceID);
+void bench_sha224(int useDeviceID);
+void bench_sha256(int useDeviceID);
+void bench_sha384(int useDeviceID);
+void bench_sha512(int useDeviceID);
+void bench_sha3_224(int useDeviceID);
+void bench_sha3_256(int useDeviceID);
+void bench_sha3_384(int useDeviceID);
+void bench_sha3_512(int useDeviceID);
+void bench_shake128(int useDeviceID);
+void bench_shake256(int useDeviceID);
+int  bench_ripemd(void);
+void bench_cmac(int useDeviceID);
+void bench_scrypt(void);
+void bench_hmac_md5(int useDeviceID);
+void bench_hmac_sha(int useDeviceID);
+void bench_hmac_sha224(int useDeviceID);
+void bench_hmac_sha256(int useDeviceID);
+void bench_hmac_sha384(int useDeviceID);
+void bench_hmac_sha512(int useDeviceID);
+void bench_siphash(void);
+void bench_rsaKeyGen(int useDeviceID);
+void bench_rsaKeyGen_size(int useDeviceID, int keySz);
+void bench_rsa(int useDeviceID);
+void bench_rsa_key(int useDeviceID, int keySz);
+void bench_dh(int useDeviceID);
+void bench_kyber(int type);
+void bench_ecc_curve(int curveId);
+void bench_eccMakeKey(int useDeviceID, int curveId);
+void bench_ecc(int useDeviceID, int curveId);
+void bench_eccEncrypt(int curveId);
+void bench_curve25519KeyGen(int useDeviceID);
+void bench_curve25519KeyAgree(int useDeviceID);
+void bench_ed25519KeyGen(void);
+void bench_ed25519KeySign(void);
+void bench_curve448KeyGen(void);
+void bench_curve448KeyAgree(void);
+void bench_ed448KeyGen(void);
+void bench_ed448KeySign(void);
+void bench_eccsiKeyGen(void);
+void bench_eccsiPairGen(void);
+void bench_eccsiValidate(void);
+void bench_eccsi(void);
+void bench_sakkeKeyGen(void);
+void bench_sakkeRskGen(void);
+void bench_sakkeValidate(void);
+void bench_sakke(void);
+void bench_rng(void);
+void bench_blake2b(void);
+void bench_blake2s(void);
+void bench_pbkdf2(void);
+void bench_falconKeySign(byte level);
+void bench_dilithiumKeySign(byte level, byte sym);
+void bench_sphincsKeySign(byte level, byte optim);
+void bench_pqcKemKeygen(word32 alg);
+void bench_pqcKemEncapDecap(word32 alg);
+
+void bench_stats_print(void);
+
+
+#ifdef __cplusplus
+    }  /* extern "C" */
+#endif
+
+
+#endif /* WOLFCRYPT_BENCHMARK_H */
+
--- a/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.sln
+++ b/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.sln
@@ -0,0 +1,59 @@
+
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual C++ Express 2005
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "benchmark", "benchmark.vcproj", "{615AEC46-5595-4DEA-9490-DBD5DE0F8772}"
+	ProjectSection(ProjectDependencies) = postProject
+		{73973223-5EE8-41CA-8E88-1D60E89A237B} = {73973223-5EE8-41CA-8E88-1D60E89A237B}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wolfssl", "..\..\wolfssl.vcxproj", "{73973223-5EE8-41CA-8E88-1D60E89A237B}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Win32 = Debug|Win32
+		Debug|x64 = Debug|x64
+		DLL Debug|Win32 = DLL Debug|Win32
+		DLL Debug|x64 = DLL Debug|x64
+		DLL Release|Win32 = DLL Release|Win32
+		DLL Release|x64 = DLL Release|x64
+		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|Win32.ActiveCfg = Debug|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|Win32.Build.0 = Debug|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|x64.ActiveCfg = Debug|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Debug|x64.Build.0 = Debug|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|Win32.ActiveCfg = Debug|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|Win32.Build.0 = Debug|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.ActiveCfg = Debug|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Debug|x64.Build.0 = Debug|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|Win32.ActiveCfg = Release|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|Win32.Build.0 = Release|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.ActiveCfg = Release|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.DLL Release|x64.Build.0 = Release|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|Win32.ActiveCfg = Release|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|Win32.Build.0 = Release|Win32
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|x64.ActiveCfg = Release|x64
+		{615AEC46-5595-4DEA-9490-DBD5DE0F8772}.Release|x64.Build.0 = Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.ActiveCfg = Debug|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|Win32.Build.0 = Debug|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.ActiveCfg = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Debug|x64.Build.0 = Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|x64.ActiveCfg = DLL Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Debug|x64.Build.0 = DLL Debug|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|Win32.Build.0 = DLL Release|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|x64.ActiveCfg = DLL Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.DLL Release|x64.Build.0 = DLL Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|Win32.ActiveCfg = Release|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|Win32.Build.0 = Release|Win32
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.ActiveCfg = Release|x64
+		{73973223-5EE8-41CA-8E88-1D60E89A237B}.Release|x64.Build.0 = Release|x64
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
--- a/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.vcproj
+++ b/android/extern/wolfssl/wolfcrypt/benchmark/benchmark.vcproj
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="benchmark"
+	ProjectGUID="{615AEC46-5595-4DEA-9490-DBD5DE0F8772}"
+	Keyword="Win32Proj"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="Debug"
+			IntermediateDirectory="Debug"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="../..;../../IDE/WIN;"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Ws2_32.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="Release"
+			IntermediateDirectory="Release"
+			ConfigurationType="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="../..;../../IDE/WIN;"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WOLFSSL_LIB;WOLFSSL_USER_SETTINGS;"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="0"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="Ws2_32.lib"
+				LinkIncremental="2"
+				GenerateDebugInformation="true"
+				SubSystem="1"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\benchmark.c"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
--- a/android/extern/wolfssl/wolfcrypt/benchmark/include.am
+++ b/android/extern/wolfssl/wolfcrypt/benchmark/include.am
@@ -0,0 +1,27 @@
+# vim:ft=automake
+# All paths should be given relative to the root
+
+if BUILD_WOLFCRYPT_TESTS
+if BUILD_BENCHMARK
+
+noinst_PROGRAMS += wolfcrypt/benchmark/benchmark
+wolfcrypt_benchmark_benchmark_SOURCES      = wolfcrypt/benchmark/benchmark.c
+wolfcrypt_benchmark_benchmark_LDADD        = src/libwolfssl.la $(LIB_STATIC_ADD)
+wolfcrypt_benchmark_benchmark_DEPENDENCIES = src/libwolfssl.la
+noinst_HEADERS += wolfcrypt/benchmark/benchmark.h
+
+endif
+endif
+
+if BUILD_WOLFCRYPT_TESTS_LIBS
+lib_LTLIBRARIES += wolfcrypt/benchmark/libwolfcryptbench.la
+wolfcrypt_benchmark_libwolfcryptbench_la_SOURCES      = wolfcrypt/benchmark/benchmark.c
+wolfcrypt_benchmark_libwolfcryptbench_la_CPPFLAGS     = -DNO_MAIN_DRIVER
+wolfcrypt_benchmark_libwolfcryptbench_la_LIBADD       = src/libwolfssl.la
+wolfcrypt_benchmark_libwolfcryptbench_la_DEPENDENCIES = src/libwolfssl.la
+endif
+
+EXTRA_DIST += wolfcrypt/benchmark/benchmark.sln
+EXTRA_DIST += wolfcrypt/benchmark/benchmark.vcproj
+EXTRA_DIST += wolfcrypt/benchmark/README.md
+DISTCLEANFILES+= wolfcrypt/benchmark/.libs/benchmark