arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rename STRUCTURED_IV to UNIQUE_IV. Sun CC workaround

pull/2/head
weidai 2007-04-16 00:29:47 +00:00
parent 21a7f223da
commit 2a427babae
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cryptlib.cpp
View File

@ -77,7 +77,7 @@ void SimpleKeyingInterface::ThrowIfResynchronizable()
void SimpleKeyingInterface::ThrowIfInvalidIV(const byte *iv) void SimpleKeyingInterface::ThrowIfInvalidIV(const byte *iv)
{ {
if (!iv && !(IVRequirement() == INTERNALLY_GENERATED_IV || IVRequirement() == STRUCTURED_IV || !IsResynchronizable())) if (!iv && !(IVRequirement() == INTERNALLY_GENERATED_IV || IVRequirement() == UNIQUE_IV || !IsResynchronizable()))
throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": this object cannot use a null IV"); throw InvalidArgument(GetAlgorithm().AlgorithmName() + ": this object cannot use a null IV");
} }

11
cryptlib.h
View File

@ -4,7 +4,7 @@
classes that provide a uniform interface to this library. classes that provide a uniform interface to this library.
*/ */
/*! \mainpage <a href="http://www.cryptopp.com">Crypto++</a><sup><small>&reg;</small></sup> Library 5.4 Reference Manual /*! \mainpage <a href="http://www.cryptopp.com">Crypto++</a><sup><small>&reg;</small></sup> Library 5.5 Reference Manual
<dl> <dl>
<dt>Abstract Base Classes<dd> <dt>Abstract Base Classes<dd>
cryptlib.h cryptlib.h
@ -375,7 +375,7 @@ public:
//! calls SetKey() with an NameValuePairs object that just specifies "IV" //! calls SetKey() with an NameValuePairs object that just specifies "IV"
void SetKeyWithIV(const byte *key, size_t length, const byte *iv); void SetKeyWithIV(const byte *key, size_t length, const byte *iv);
enum IV_Requirement {STRUCTURED_IV = 0, RANDOM_IV, UNPREDICTABLE_RANDOM_IV, INTERNALLY_GENERATED_IV, NOT_RESYNCHRONIZABLE}; enum IV_Requirement {UNIQUE_IV = 0, RANDOM_IV, UNPREDICTABLE_RANDOM_IV, INTERNALLY_GENERATED_IV, NOT_RESYNCHRONIZABLE};
//! returns the minimal requirement for secure IVs //! returns the minimal requirement for secure IVs
virtual IV_Requirement IVRequirement() const =0; virtual IV_Requirement IVRequirement() const =0;
@ -387,7 +387,7 @@ public:
//! returns whether this object can use random but possibly predictable IVs (in addition to ones returned by GetNextIV) //! returns whether this object can use random but possibly predictable IVs (in addition to ones returned by GetNextIV)
bool CanUsePredictableIVs() const {return IVRequirement() <= RANDOM_IV;} bool CanUsePredictableIVs() const {return IVRequirement() <= RANDOM_IV;}
//! returns whether this object can use structured IVs, for example a counter (in addition to ones returned by GetNextIV) //! returns whether this object can use structured IVs, for example a counter (in addition to ones returned by GetNextIV)
bool CanUseStructuredIVs() const {return IVRequirement() <= STRUCTURED_IV;} bool CanUseStructuredIVs() const {return IVRequirement() <= UNIQUE_IV;}
//! returns size of IVs used by this object //! returns size of IVs used by this object
virtual unsigned int IVSize() const {throw NotImplemented("SimpleKeyingInterface: this object doesn't support resynchronization");} virtual unsigned int IVSize() const {throw NotImplemented("SimpleKeyingInterface: this object doesn't support resynchronization");}
@ -1029,6 +1029,11 @@ public:
// for internal library use // for internal library use
void DoQuickSanityCheck() const {ThrowIfInvalid(NullRNG(), 0);} void DoQuickSanityCheck() const {ThrowIfInvalid(NullRNG(), 0);}
#ifdef __SUNPRO_CC
// Sun Studio 11/CC 5.8 workaround: it generates incorrect code when casting to an empty virtual base class
char m_sunCCworkaround;
#endif
}; };
//! interface for generatable crypto material, such as private keys and crypto parameters //! interface for generatable crypto material, such as private keys and crypto parameters