From daec4644fb12b026eb5210827fe66cae3928635a Mon Sep 17 00:00:00 2001
From: weidai <weidai@57ff6487-cd31-0410-9ec3-f628ee90f5f0>
Date: Mon, 18 Dec 2006 02:34:33 +0000
Subject: update version number, port to Sun C++ 5.8

git-svn-id: svn://svn.code.sf.net/p/cryptopp/code/trunk/c5@265 57ff6487-cd31-0410-9ec3-f628ee90f5f0
---
 eccrypto.cpp | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'eccrypto.cpp')

diff --git a/eccrypto.cpp b/eccrypto.cpp
index 876ee79..91ec54f 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
-- 
cgit v1.2.1