diff --git a/eccrypto.h b/eccrypto.h
index ae2688bf..f6016c07 100644
--- a/eccrypto.h
+++ b/eccrypto.h
@@ -585,8 +585,9 @@ public:
 //! \brief Elliptic Curve German Digital Signature Algorithm signature scheme
 //! \tparam EC elliptic curve field
 //! \tparam H HashTransformation derived class
-//! \sa Erwin Hess, Marcus Schafheutle, and Pascale Serf <A HREF="http://www.teletrust.de/fileadmin/files/oid/ecgdsa_final.pdf">The
-//!   Digital Signature Scheme ECGDSA (October 24, 2006)</A>
+//! \sa Erwin Hess, Marcus Schafheutle, and Pascale Serf <A
+//!   HREF="http://www.teletrust.de/fileadmin/files/oid/ecgdsa_final.pdf">The Digital Signature Scheme
+//!   ECGDSA (October 24, 2006)</A>
 //! \since Crypto++ 6.0
 template <class EC, class H>
 struct ECGDSA : public DL_SS<
diff --git a/gfpcrypt.h b/gfpcrypt.h
index c3260ca8..f2baa2a4 100644
--- a/gfpcrypt.h
+++ b/gfpcrypt.h
@@ -1,6 +1,6 @@
 // gfpcrypt.h - originally written and placed in the public domain by Wei Dai
-//              RFC6979 deterministic signatures (DL_Algorithm_DSA_RFC6979) added by by Douglas Roark
-//              ECGDSA (DL_Algorithm_GDSA_ISO15946) added by Jeffrey Walton
+//              RFC6979 deterministic signatures added by Douglas Roark
+//              ECGDSA added by Jeffrey Walton
 
 //! \file gfpcrypt.h
 //! \brief Classes and functions for schemes based on Discrete Logs (DL) over GF(p)
@@ -368,13 +368,13 @@ protected:
         if (block.size() > rlen)
         {
             size_t offset = block.size() - rlen;
-            memcpy(t, block + offset, rlen);
+            std::memcpy(t, block + offset, rlen);
         }
         else // block.size() < rlen
         {
             size_t offset = rlen - block.size();
             memset(t, '\x00', offset);
-            memcpy(t + offset, block, rlen - offset);
+            std::memcpy(t + offset, block, rlen - offset);
         }
 
         return t;
diff --git a/pubkey.h b/pubkey.h
index 45e3e26b..54374129 100644
--- a/pubkey.h
+++ b/pubkey.h
@@ -447,6 +447,19 @@ public:
 		byte *representative, size_t representativeBitLength) const;
 };
 
+//! \class DL_SignatureMessageEncodingMethod_SM2
+//! \brief Interface for message encoding method for public key signature schemes.
+//! \details \p DL_SignatureMessageEncodingMethod_SM2 provides interfaces
+//!   for message encoding method for SM2.
+class CRYPTOPP_DLL DL_SignatureMessageEncodingMethod_SM2 : public PK_DeterministicSignatureMessageEncodingMethod
+{
+public:
+	void ComputeMessageRepresentative(RandomNumberGenerator &rng,
+		const byte *recoverableMessage, size_t recoverableMessageLength,
+		HashTransformation &hash, HashIdentifier hashIdentifier, bool messageEmpty,
+		byte *representative, size_t representativeBitLength) const;
+};
+
 //! \class PK_MessageAccumulatorBase
 //! \brief Interface for message encoding method for public key signature schemes.
 //! \details \p PK_MessageAccumulatorBase provides interfaces
@@ -828,7 +841,7 @@ public:
 	//! \details The subgroup generator is retrieved from the base precomputation
 	virtual const Element & GetSubgroupGenerator() const {return GetBasePrecomputation().GetBase(GetGroupPrecomputation());}
 
-	//! \brief Set the subgroup generator
+	//! \brief Sets the subgroup generator
 	//! \param base the new subgroup generator
 	//! \details The subgroup generator is set in the base precomputation
 	virtual void SetSubgroupGenerator(const Element &base) {AccessBasePrecomputation().SetBase(GetGroupPrecomputation(), base);}
@@ -1034,29 +1047,65 @@ public:
 
 	virtual ~DL_PublicKey();
 
+	//! \brief Get a named value
+	//! \param name the name of the object or value to retrieve
+	//! \param valueType reference to a variable that receives the value
+	//! \param pValue void pointer to a variable that receives the value
+	//! \returns true if the value was retrieved, false otherwise
+	//! \details GetVoidValue() retrieves the value of name if it exists.
+	//! \note GetVoidValue() is an internal function and should be implemented
+	//!   by derived classes. Users should use one of the other functions instead.
+	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
+	//!   GetRequiredParameter() and GetRequiredIntParameter()
 	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
 	{
 		return GetValueHelper(this, name, valueType, pValue, &this->GetAbstractGroupParameters())
 				CRYPTOPP_GET_FUNCTION_ENTRY(PublicElement);
 	}
 
+	//! \brief Initialize or reinitialize this this key
+	//! \param source NameValuePairs to assign
 	void AssignFrom(const NameValuePairs &source);
 
-	// non-inherited
+	//! \brief Retrieves the public element
+	//! \returns the public element
 	virtual const Element & GetPublicElement() const {return GetPublicPrecomputation().GetBase(this->GetAbstractGroupParameters().GetGroupPrecomputation());}
+
+	//! \brief Sets the public element
+	//! \param y the public element
 	virtual void SetPublicElement(const Element &y) {AccessPublicPrecomputation().SetBase(this->GetAbstractGroupParameters().GetGroupPrecomputation(), y);}
+
+	//! \brief Exponentiates this element
+	//! \param exponent the exponent to raise the base
+	//! \returns the public element raised to the exponent
 	virtual Element ExponentiatePublicElement(const Integer &exponent) const
 	{
 		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
 		return GetPublicPrecomputation().Exponentiate(params.GetGroupPrecomputation(), exponent);
 	}
+
+	//! \brief Exponentiates an element
+	//! \param baseExp the first exponent
+	//! \param publicExp the second exponent
+	//! \returns the public element raised to the exponent
+	//! \details CascadeExponentiateBaseAndPublicElement raises the public element to
+	//!   the base element and precomputation.
 	virtual Element CascadeExponentiateBaseAndPublicElement(const Integer &baseExp, const Integer &publicExp) const
 	{
 		const DL_GroupParameters<T> &params = this->GetAbstractGroupParameters();
 		return params.GetBasePrecomputation().CascadeExponentiate(params.GetGroupPrecomputation(), baseExp, GetPublicPrecomputation(), publicExp);
 	}
 
+	//! \brief Accesses the public precomputation
+	//! \details GetPublicPrecomputation returns a const reference, while
+	//!   AccessPublicPrecomputation returns a non-const reference. Must be
+	//!   overridden in derived classes.
 	virtual const DL_FixedBasePrecomputation<T> & GetPublicPrecomputation() const =0;
+
+	//! \brief Accesses the public precomputation
+	//! \details GetPublicPrecomputation returns a const reference, while
+	//!   AccessPublicPrecomputation returns a non-const reference. Must be
+	//!   overridden in derived classes.
 	virtual DL_FixedBasePrecomputation<T> & AccessPublicPrecomputation() =0;
 };
 
@@ -1075,18 +1124,32 @@ public:
 
 	virtual ~DL_PrivateKey();
 
+	//! \brief Initializes a public key from this key
+	//! \param pub reference to a public key
 	void MakePublicKey(DL_PublicKey<T> &pub) const
 	{
 		pub.AccessAbstractGroupParameters().AssignFrom(this->GetAbstractGroupParameters());
 		pub.SetPublicElement(this->GetAbstractGroupParameters().ExponentiateBase(GetPrivateExponent()));
 	}
 
+	//! \brief Get a named value
+	//! \param name the name of the object or value to retrieve
+	//! \param valueType reference to a variable that receives the value
+	//! \param pValue void pointer to a variable that receives the value
+	//! \returns true if the value was retrieved, false otherwise
+	//! \details GetVoidValue() retrieves the value of name if it exists.
+	//! \note GetVoidValue() is an internal function and should be implemented
+	//!   by derived classes. Users should use one of the other functions instead.
+	//! \sa GetValue(), GetValueWithDefault(), GetIntValue(), GetIntValueWithDefault(),
+	//!   GetRequiredParameter() and GetRequiredIntParameter()
 	bool GetVoidValue(const char *name, const std::type_info &valueType, void *pValue) const
 	{
 		return GetValueHelper(this, name, valueType, pValue, &this->GetAbstractGroupParameters())
 				CRYPTOPP_GET_FUNCTION_ENTRY(PrivateExponent);
 	}
 
+	//! \brief Initialize or reinitialize this this key
+	//! \param source NameValuePairs to assign
 	void AssignFrom(const NameValuePairs &source)
 	{
 		this->AccessAbstractGroupParameters().AssignFrom(source);
@@ -1094,7 +1157,13 @@ public:
 			CRYPTOPP_SET_FUNCTION_ENTRY(PrivateExponent);
 	}
 
+	//! \brief Retrieves the private exponent
+	//! \returns the private exponent
+	//! \details Must be overridden in derived classes.
 	virtual const Integer & GetPrivateExponent() const =0;
+	//! \brief Sets the private exponent
+	//! \param x the private exponent
+	//! \details Must be overridden in derived classes.
 	virtual void SetPrivateExponent(const Integer &x) =0;
 };