Skip to content

Commit

Permalink
The Crypto++ library can now be compiled with C++Builder
Browse files Browse the repository at this point in the history
Two macro were causing compiler problems with bcc32
[bcc32 Error] seckey.h(83): E2313 Constant expression required
and
[bcc32 Error] seckey.h(194): E2313 Constant expression required
  • Loading branch information
Crayon2000 committed Jan 12, 2016
1 parent 405af0a commit 602eb5f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion misc.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// misc.h - written and placed in the public domain by Wei Dai
// misc.h - written and placed in the public domain by Wei Dai

//! \file misc.h
//! \brief Utility functions for the Crypto++ library.
Expand Down
9 changes: 7 additions & 2 deletions seckey.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,12 +80,15 @@ class VariableRounds
//! \throws InvalidRounds if the number of rounds are invalid
inline void ThrowIfInvalidRounds(int rounds, const Algorithm *alg)
{
#if (M==INT_MAX) // Coverity and result_independent_of_operands
#if defined(__BORLANDC__)
if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS)
throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds);
#elif (M==INT_MAX) // Coverity and result_independent_of_operands
if (rounds < MIN_ROUNDS)
throw InvalidRounds(alg ? alg->AlgorithmName() : "VariableRounds", rounds);
#else
if (rounds < MIN_ROUNDS || rounds > MAX_ROUNDS)
throw InvalidRounds(alg ? alg->AlgorithmName() : std::string("VariableRounds"), rounds);
throw InvalidRounds(alg ? alg->AlgorithmName() : "VariableRounds", rounds);
#endif
}

Expand Down Expand Up @@ -191,10 +194,12 @@ class VariableKeyLength
//! \details keylength is provided in bytes, not bits.
static size_t CRYPTOPP_API StaticGetValidKeyLength(size_t keylength)
{
#if !defined(__BORLANDC__)
#if MIN_KEYLENGTH > 0
if (keylength < (size_t)MIN_KEYLENGTH)
return MIN_KEYLENGTH;
else
#endif
#endif
if (keylength > (size_t)MAX_KEYLENGTH)
return (size_t)MAX_KEYLENGTH;
Expand Down

0 comments on commit 602eb5f

Please sign in to comment.