diff options
author | weidai <weidai11@users.noreply.github.com> | 2006-12-18 02:34:33 +0000 |
---|---|---|
committer | weidai <weidai11@users.noreply.github.com> | 2006-12-18 02:34:33 +0000 |
commit | 43b41c1042164bc5194f3f61a2ca131ea9014b4a (patch) | |
tree | 9732b0bb2e34535743af1bc3680de2ea8d013710 /eccrypto.cpp | |
parent | 54a2acd0aab8ab74ae2c9b88805d259398a1b17e (diff) | |
download | cryptopp-git-43b41c1042164bc5194f3f61a2ca131ea9014b4a.tar.gz |
update version number, port to Sun C++ 5.8
Diffstat (limited to 'eccrypto.cpp')
-rw-r--r-- | eccrypto.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/eccrypto.cpp b/eccrypto.cpp index 876ee798..91ec54f1 100644 --- a/eccrypto.cpp +++ b/eccrypto.cpp @@ -2,6 +2,9 @@ #include "pch.h" +// prevent Sun's CC compiler from including this file automatically +#if !defined(__SUNPRO_CC) || defined(CRYPTOPP_MANUALLY_INSTANTIATE_TEMPLATES) + #ifndef CRYPTOPP_IMPORTS #include "eccrypto.h" @@ -571,7 +574,7 @@ OID DL_GroupParameters_EC<EC>::GetAlgorithmID() const // ****************************************************************** template <class EC> -void DL_PublicKey_EC<EC>::BERDecodeKey2(BufferedTransformation &bt, bool parametersPresent, size_t size) +void DL_PublicKey_EC<EC>::BERDecodePublicKey(BufferedTransformation &bt, bool parametersPresent, size_t size) { typename EC::Point P; if (!this->GetGroupParameters().GetCurve().DecodePoint(P, bt, size)) @@ -580,7 +583,7 @@ void DL_PublicKey_EC<EC>::BERDecodeKey2(BufferedTransformation &bt, bool paramet } template <class EC> -void DL_PublicKey_EC<EC>::DEREncodeKey(BufferedTransformation &bt) const +void DL_PublicKey_EC<EC>::DEREncodePublicKey(BufferedTransformation &bt) const { this->GetGroupParameters().GetCurve().EncodePoint(bt, this->GetPublicElement(), this->GetGroupParameters().GetPointCompression()); } @@ -588,7 +591,7 @@ void DL_PublicKey_EC<EC>::DEREncodeKey(BufferedTransformation &bt) const // ****************************************************************** template <class EC> -void DL_PrivateKey_EC<EC>::BERDecodeKey2(BufferedTransformation &bt, bool parametersPresent, size_t size) +void DL_PrivateKey_EC<EC>::BERDecodePrivateKey(BufferedTransformation &bt, bool parametersPresent, size_t size) { BERSequenceDecoder seq(bt); word32 version; @@ -626,7 +629,7 @@ void DL_PrivateKey_EC<EC>::BERDecodeKey2(BufferedTransformation &bt, bool parame } template <class EC> -void DL_PrivateKey_EC<EC>::DEREncodeKey(BufferedTransformation &bt) const +void DL_PrivateKey_EC<EC>::DEREncodePrivateKey(BufferedTransformation &bt) const { DERSequenceEncoder privateKey(bt); DEREncodeUnsigned<word32>(privateKey, 1); // version @@ -639,3 +642,5 @@ void DL_PrivateKey_EC<EC>::DEREncodeKey(BufferedTransformation &bt) const NAMESPACE_END #endif + +#endif |