various changes for 5.1

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@38 57ff6487-cd31-0410-9ec3-f628ee90f5f0

1 files changed, 4 insertions, 4 deletions

diff --git a/oaep.h b/oaep.h
index 96baaa1..c242698 100644
--- a/oaep.h
+++ b/oaep.h
@@ -8,12 +8,12 @@ NAMESPACE_BEGIN(CryptoPP)
 extern byte OAEP_P_DEFAULT[];	// defined in misc.cpp
 
 /// <a href="http://www.weidai.com/scan-mirror/ca.html#cem_OAEP-MGF1">EME-OAEP</a>, for use with RSAES
-template <class H, class MGF=P1363_MGF1<H>, byte *P=OAEP_P_DEFAULT, unsigned int PLen=0>
-class OAEP : public PK_PaddingAlgorithm, public EncryptionStandard
+template <class H, class MGF=P1363_MGF1, byte *P=OAEP_P_DEFAULT, unsigned int PLen=0>
+class OAEP : public PK_EncryptionMessageEncodingMethod, public EncryptionStandard
 {
 public:
-	static std::string StaticAlgorithmName() {return "OAEP-" + MGF::StaticAlgorithmName();}
-	typedef OAEP<H, MGF, P, PLen> EncryptionPaddingAlgorithm;
+	static std::string StaticAlgorithmName() {return std::string("OAEP-") + MGF::StaticAlgorithmName() + "(" + H::StaticAlgorithmName() + ")";}
+	typedef OAEP<H, MGF, P, PLen> EncryptionMessageEncodingMethod;
 
 	unsigned int MaxUnpaddedLength(unsigned int paddedLength) const;
 	void Pad(RandomNumberGenerator &rng, const byte *raw, unsigned int inputLength, byte *padded, unsigned int paddedLength) const;