Skip to content

Commit

Permalink
Prepare for Crypto++ 8.7.1 release
Browse files Browse the repository at this point in the history
  • Loading branch information
noloader committed Jun 25, 2023
1 parent d6bc19d commit 1e9e6e1
Show file tree
Hide file tree
Showing 10 changed files with 50 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion GNUmakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions History.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
12 changes: 10 additions & 2 deletions Readme.txt
Original file line number Diff line number Diff line change
@@ -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:
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
11 changes: 7 additions & 4 deletions TestScripts/change-version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions config_ver.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@
/// 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
/// came from. It is not necessarily the version of the library built as a
/// 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

Expand Down
2 changes: 1 addition & 1 deletion cryptlib.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
<dl>
<dt>Abstract Base Classes<dd>
cryptlib.h
Expand Down
8 changes: 4 additions & 4 deletions cryptopp.rc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"
Expand Down
24 changes: 12 additions & 12 deletions misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand All @@ -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)
{
Expand Down
8 changes: 4 additions & 4 deletions rsa.h
Original file line number Diff line number Diff line change
Expand Up @@ -221,11 +221,11 @@ DOCUMENTED_TYPEDEF(RSAES<OAEP<SHA1> >::Encryptor, RSAES_OAEP_SHA_Encryptor);

/// \brief \ref RSAES<STANDARD> "RSAES<OAEP<SHA256>>::Decryptor" typedef
/// \details RSA encryption scheme defined in PKCS #1 v2.0
/// \since Crypto++ 8.7
/// \since Crypto++ 8.7.1
DOCUMENTED_TYPEDEF(RSAES<OAEP<SHA256> >::Decryptor, RSAES_OAEP_SHA256_Decryptor);
/// \brief \ref RSAES<STANDARD> "RSAES<OAEP<SHA256>>::Encryptor" typedef
/// \details RSA encryption scheme defined in PKCS #1 v2.0
/// \since Crypto++ 8.7
/// \since Crypto++ 8.7.1
DOCUMENTED_TYPEDEF(RSAES<OAEP<SHA256> >::Encryptor, RSAES_OAEP_SHA256_Encryptor);

#ifdef CRYPTOPP_DOXYGEN_PROCESSING
Expand All @@ -240,11 +240,11 @@ class RSASSA_PKCS1v15_SHA_Verifier : public RSASS<PKCS1v15,SHA1>::Verifier {};

/// \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15,SHA256>::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<PKCS1v15,SHA256>::Signer {};
/// \brief \ref RSASS<STANDARD,HASH> "RSASS<PKCS1v15,SHA256>::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<PKCS1v15,SHA256>::Verifier {};

namespace Weak {
Expand Down

1 comment on commit 1e9e6e1

@noloader
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Crypto++ 8.7.1 was not released due to a change in some macros. Crypto++ 8.8 was released instead.

Please sign in to comment.