From 1e9e6e137a9ae14bf9cf8056b0bf372eed04ab82 Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Sat, 24 Jun 2023 23:45:48 -0400 Subject: [PATCH] Prepare for Crypto++ 8.7.1 release --- Doxyfile | 2 +- GNUmakefile | 2 +- History.txt | 8 ++++++++ Readme.txt | 12 ++++++++++-- TestScripts/change-version.sh | 11 +++++++---- config_ver.h | 4 ++-- cryptlib.h | 2 +- cryptopp.rc | 8 ++++---- misc.h | 24 ++++++++++++------------ rsa.h | 8 ++++---- 10 files changed, 50 insertions(+), 31 deletions(-) diff --git a/Doxyfile b/Doxyfile index 0655650a5..46adaa7b5 100644 --- a/Doxyfile +++ b/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = Crypto++ # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = 8.7 +PROJECT_NUMBER = 8.7.1 # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a diff --git a/GNUmakefile b/GNUmakefile index 76ea2749f..0f5c818c3 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1540,7 +1540,7 @@ cryptopp.pc libcryptopp.pc: @echo '' >> libcryptopp.pc @echo 'Name: Crypto++' >> libcryptopp.pc @echo 'Description: Crypto++ cryptographic library' >> libcryptopp.pc - @echo 'Version: 8.7' >> libcryptopp.pc + @echo 'Version: 8.7.1' >> libcryptopp.pc @echo 'URL: https://cryptopp.com/' >> libcryptopp.pc @echo '' >> libcryptopp.pc @echo 'Cflags: -I$${includedir}' >> libcryptopp.pc diff --git a/History.txt b/History.txt index 748e2c09c..e5b30ccf7 100644 --- a/History.txt +++ b/History.txt @@ -580,3 +580,11 @@ last several releases. * restored performance and avoided performance penalty of a temp buffer - fix undersized SecBlock buffer in Integer bit operations - work around several GCC 11 & 12 problems + +8.7.1 - June 24, 2023 + - minor release, no recompile of programs required + - expanded community input and support + * 88 unique contributors as of this release + - fix crash in cryptest.exe when invoked woth no options + - fix buid warnings + - documentation updates diff --git a/Readme.txt b/Readme.txt index a5f5f3320..6d42f3de4 100644 --- a/Readme.txt +++ b/Readme.txt @@ -1,5 +1,5 @@ Crypto++: free C++ Class Library of Cryptographic Schemes -Version 8.8 - TBD +Version 8.7.1 - June 24, 2023 Crypto++ Library is a free C++ class library of cryptographic schemes. Currently the library contains the following algorithms: @@ -92,7 +92,7 @@ The following compilers are supported for this release. Please visit http://www.cryptopp.com the most up to date build instructions and porting notes. * Visual Studio 2003 - 2022 - * GCC 3.3 - 12.2 + * GCC 3.3 - 13.1 * Apple Clang 4.3 - 12.0 * LLVM Clang 2.9 - 14.0 * C++ Builder 2015 @@ -294,6 +294,14 @@ documentation is one of the highest returns on investment. The items in this section comprise the most recent history. Please see History.txt for the record back to Crypto++ 1.0. +8.7.1 - June 24, 2023 + - minor release, no recompile of programs required + - expanded community input and support + * 88 unique contributors as of this release + - fix crash in cryptest.exe when invoked woth no options + - fix buid warnings + - documentation updates + 8.7.0 - August 7, 2022 - minor release, recompile of programs required - expanded community input and support diff --git a/TestScripts/change-version.sh b/TestScripts/change-version.sh index ee2ef5967..89c6c748a 100755 --- a/TestScripts/change-version.sh +++ b/TestScripts/change-version.sh @@ -16,14 +16,17 @@ # ############################################################################# -sed 's/Library 8.7 API/Library 8.6 API/g' cryptlib.h > cryptlib.h.new +sed 's/Library 8.7.1 API/Library 8.7 API/g' cryptlib.h > cryptlib.h.new mv cryptlib.h.new cryptlib.h -sed 's/= 8.7/= 8.6/g' Doxyfile > Doxyfile.new +sed 's/= 8.7.1/= 8.7$/g' Doxyfile > Doxyfile.new mv Doxyfile.new Doxyfile -sed 's/CRYPTOPP_MINOR 7/CRYPTOPP_MINOR 6/g' config_ver.h > config_ver.h.new +sed 's/CRYPTOPP_MINOR 7/CRYPTOPP_MINOR 7/g' config_ver.h > config_ver.h.new mv config_ver.h.new config_ver.h -sed 's/CRYPTOPP_VERSION 870/CRYPTOPP_VERSION 860/g' config_ver.h > config_ver.h.new +sed 'CRYPTOPP_REVISION CRYPTOPP_REVISION 1/g' config_ver.h > config_ver.h.new +mv config_ver.h.new config_ver.h + +sed 's/CRYPTOPP_VERSION 871/CRYPTOPP_VERSION 870/g' config_ver.h > config_ver.h.new mv config_ver.h.new config_ver.h diff --git a/config_ver.h b/config_ver.h index 410fa10f5..f52ede1bb 100644 --- a/config_ver.h +++ b/config_ver.h @@ -42,7 +42,7 @@ /// as a shared object if versions are inadvertently mixed and matched. /// \sa CRYPTOPP_VERSION, LibraryVersion(), HeaderVersion() /// \since Crypto++ 8.2 -#define CRYPTOPP_REVISION 0 +#define CRYPTOPP_REVISION 1 /// \brief Full library version /// \details CRYPTOPP_VERSION reflects the version of the library the headers @@ -50,7 +50,7 @@ /// shared object if versions are inadvertently mixed and matched. /// \sa CRYPTOPP_MAJOR, CRYPTOPP_MINOR, CRYPTOPP_REVISION, LibraryVersion(), HeaderVersion() /// \since Crypto++ 5.6 -#define CRYPTOPP_VERSION 870 +#define CRYPTOPP_VERSION 871 // Compiler version macros diff --git a/cryptlib.h b/cryptlib.h index 3e07e860e..c9a631cd1 100644 --- a/cryptlib.h +++ b/cryptlib.h @@ -3,7 +3,7 @@ /// \file cryptlib.h /// \brief Abstract base classes that provide a uniform interface to this library. -/*! \mainpage Crypto++ Library 8.7 API Reference +/*! \mainpage Crypto++ Library 8.7.1 API Reference
Abstract Base Classes
cryptlib.h diff --git a/cryptopp.rc b/cryptopp.rc index 0d010335a..f4bf118c3 100644 --- a/cryptopp.rc +++ b/cryptopp.rc @@ -27,8 +27,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // VS_VERSION_INFO VERSIONINFO - FILEVERSION 8,7,0,0 - PRODUCTVERSION 8,7,0,0 + FILEVERSION 8,7,1,0 + PRODUCTVERSION 8,7,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -46,13 +46,13 @@ BEGIN VALUE "Comments", "Free crypto library, more information available at www.cryptopp.com" VALUE "CompanyName", "Crypto++® project" VALUE "FileDescription", "Crypto++® Library DLL" - VALUE "FileVersion", "8, 7, 0, 0" + VALUE "FileVersion", "8, 7, 1, 0" VALUE "InternalName", "cryptopp" VALUE "LegalCopyright", "Copyright© 1995-2021 by Wei Dai" VALUE "LegalTrademarks", "Crypto++®" VALUE "OriginalFilename", "cryptopp.dll" VALUE "ProductName", "Crypto++® Library" - VALUE "ProductVersion", "8, 7, 0, 0" + VALUE "ProductVersion", "8, 7, 1, 0" END END BLOCK "VarFileInfo" diff --git a/misc.h b/misc.h index 564a12ca5..0dcb0a6b9 100644 --- a/misc.h +++ b/misc.h @@ -736,7 +736,7 @@ inline bool SafeConvert(T1 from, T2 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(sword64 from, word64 &to) { @@ -752,7 +752,7 @@ inline bool SafeConvert(sword64 from, word64 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(word32 from, word64 &to) { @@ -766,7 +766,7 @@ inline bool SafeConvert(word32 from, word64 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(sword32 from, word64 &to) { @@ -782,7 +782,7 @@ inline bool SafeConvert(sword32 from, word64 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(word64 from, sword64 &to) { @@ -798,7 +798,7 @@ inline bool SafeConvert(word64 from, sword64 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(word32 from, sword64 &to) { @@ -812,7 +812,7 @@ inline bool SafeConvert(word32 from, sword64 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(sword32 from, sword64 &to) { @@ -826,7 +826,7 @@ inline bool SafeConvert(sword32 from, sword64 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(word64 from, word32 &to) { @@ -842,7 +842,7 @@ inline bool SafeConvert(word64 from, word32 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(sword64 from, word32 &to) { @@ -860,7 +860,7 @@ inline bool SafeConvert(sword64 from, word32 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(sword32 from, word32 &to) { @@ -876,7 +876,7 @@ inline bool SafeConvert(sword32 from, word32 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(word64 from, sword32 &to) { @@ -892,7 +892,7 @@ inline bool SafeConvert(word64 from, sword32 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(sword64 from, sword32 &to) { @@ -910,7 +910,7 @@ inline bool SafeConvert(sword64 from, sword32 &to) /// \return true if its safe to convert from \p from to \p to, false otherwise. /// \details if the function returns true, then it is safe to use \p to. If the function /// returns false, then \p to is undefined and should not be used. -/// \since Crypto++ 8.8 +/// \since Crypto++ 8.7.1 template<> inline bool SafeConvert(word32 from, sword32 &to) { diff --git a/rsa.h b/rsa.h index 4a5c3cbe7..f3ea93676 100644 --- a/rsa.h +++ b/rsa.h @@ -221,11 +221,11 @@ DOCUMENTED_TYPEDEF(RSAES >::Encryptor, RSAES_OAEP_SHA_Encryptor); /// \brief \ref RSAES "RSAES>::Decryptor" typedef /// \details RSA encryption scheme defined in PKCS #1 v2.0 -/// \since Crypto++ 8.7 +/// \since Crypto++ 8.7.1 DOCUMENTED_TYPEDEF(RSAES >::Decryptor, RSAES_OAEP_SHA256_Decryptor); /// \brief \ref RSAES "RSAES>::Encryptor" typedef /// \details RSA encryption scheme defined in PKCS #1 v2.0 -/// \since Crypto++ 8.7 +/// \since Crypto++ 8.7.1 DOCUMENTED_TYPEDEF(RSAES >::Encryptor, RSAES_OAEP_SHA256_Encryptor); #ifdef CRYPTOPP_DOXYGEN_PROCESSING @@ -240,11 +240,11 @@ class RSASSA_PKCS1v15_SHA_Verifier : public RSASS::Verifier {}; /// \brief \ref RSASS "RSASS::Signer" typedef /// \details RSA signature schemes defined in PKCS #1 v2.0 -/// \since Crypto++ 8.7 +/// \since Crypto++ 8.7.1 class RSASSA_PKCS1v15_SHA256_Signer : public RSASS::Signer {}; /// \brief \ref RSASS "RSASS::Verifier" typedef /// \details RSA signature schemes defined in PKCS #1 v2.0 -/// \since Crypto++ 8.7 +/// \since Crypto++ 8.7.1 class RSASSA_PKCS1v15_SHA256_Verifier : public RSASS::Verifier {}; namespace Weak {