Merge pull request #13 from dgarske/v1.1

wolfPKCS v1.1 release prep
wolfSSL · May 8, 2022 · 86610c2 · 86610c2
2 parents 8959d66 + ec74cfa
commit 86610c2
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -61,6 +61,25 @@ Set to any value to stop storage of token data.
 
 ## Release Notes
 
-### wolfPKCS11 Release 1.0 (10/20/2021)
-
+### wolfPKCS11 Release 1.1 (May 6, 2022)
+
+* Added support for CKM_AES_CBC_PAD
+* Added support for storage of token data.
+* Added support encrypted private keys.
+* Added CKF_LOGIN_REQUIRED to the slot flags.
+* Added RSA X_509 support for signing/verifying
+* Added missing `CK_INVALID_SESSION`.
+* Added some missing PKCS11 types.
+* Fixed building with FIPS 140-2 (fipsv2).
+* Fixed `WP11_API` visibility.
+* Fixed test pin to be at least 14-characters as required by FIPS HMAC.
+* Fixed getting a boolean for the operations flags.
+* Fixed misleading indentation fixes.
+* Improve the `curve_oid` lookup with FIPS.
+* Removed `config.h` from the public pkcs11.h header.
+* Convert repository to GPLv3.
+
+### wolfPKCS11 Release 1.0 (October 20, 2021)
+
+* Initial PKCS11 support
 
diff --git a/configure.ac b/configure.ac
@@ -7,7 +7,7 @@
 #
 AC_COPYRIGHT([Copyright (C) 2014-2018 wolfSSL Inc.])
 AC_PREREQ([2.63])
-AC_INIT([wolfpkcs11],[1.0.0],[https://github.com/wolfssl/wolfpkcs11/issues],[wolfpkcs11],[http:https://www.wolfssl.com])
+AC_INIT([wolfpkcs11],[1.1.0],[https://github.com/wolfssl/wolfpkcs11/issues],[wolfpkcs11],[http:https://www.wolfssl.com])
 AC_CONFIG_AUX_DIR([build-aux])
 
 # The following sets CFLAGS to empty if unset on command line.
@@ -30,7 +30,7 @@ AC_ARG_PROGRAM
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([wolfpkcs11/config.h])
 
-WOLFPKCS11_LIBRARY_VERSION=1:0:0
+WOLFPKCS11_LIBRARY_VERSION=2:0:0
 # | | |
 # +------+ | +---+
 # | | |

diff --git a/src/internal.c b/src/internal.c
@@ -37,7 +37,9 @@
 #include <wolfpkcs11/store.h>
 
 #ifndef HAVE_SCRYPT
- #error PKCS11 requires scrypt. Please build wolfssl with `./configure --enable-rsapss --enable-keygen --enable-pwdbased --enable-scrypt C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP"`
+ #error PKCS11 requires scrypt. Please build wolfssl with " \
+ "`./configure --enable-rsapss --enable-keygen --enable-pwdbased " \
+ "--enable-scrypt C_EXTRA_FLAGS="-DWOLFSSL_PUBLIC_MP -DWC_RSA_DIRECT"`
 #endif
 
 /* Size of hash calculated from PIN. */

diff --git a/wolfpkcs11/version.h b/wolfpkcs11/version.h
@@ -28,8 +28,8 @@
 extern "C" {
 #endif
 
-#define LIBWOLFPKCS11_VERSION_STRING "1.0.0"
-#define LIBWOLFPKCS11_VERSION_HEX 0x01000000
+#define LIBWOLFPKCS11_VERSION_STRING "1.1.0"
+#define LIBWOLFPKCS11_VERSION_HEX 0x01001000
 
 #ifdef __cplusplus
 }