You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by sc...@apache.org on 2017/12/04 22:24:06 UTC
svn commit: r1817135 - in /santuario/xml-security-cpp/trunk/xsec: dsig/ enc/
enc/NSS/ enc/OpenSSL/ enc/WinCAPI/ framework/ transformers/ xenc/impl/
Author: scantor
Date: Mon Dec 4 22:24:05 2017
New Revision: 1817135
URL: http://svn.apache.org/viewvc?rev=1817135&view=rev
Log:
Set key parameter to const in algorithm API.
Modified:
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.hpp
santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHash.hpp
santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp
santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.hpp
santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp
santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp
santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp
santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHash.hpp
santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp
santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp
santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoHash.hpp
santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmHandler.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp
santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp
santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.hpp
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.cpp Mon Dec 4 22:24:05 2017
@@ -213,7 +213,7 @@ XSECAlgorithmHandler * DSIGAlgorithmHand
// Add a hash txfm
// --------------------------------------------------------------------------------
-TXFMBase * addHashTxfm(signatureMethod sm, hashMethod hm, XSECCryptoKey * key,
+TXFMBase * addHashTxfm(signatureMethod sm, hashMethod hm, const XSECCryptoKey * key,
DOMDocument * doc) {
// Given a hash method and signature method, create an appropriate TXFM
@@ -328,7 +328,7 @@ TXFMBase * addHashTxfm(signatureMethod s
bool DSIGAlgorithmHandlerDefault::appendSignatureHashTxfm(TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key) const {
+ const XSECCryptoKey * key) const {
signatureMethod sm;
hashMethod hm;
@@ -362,7 +362,7 @@ bool DSIGAlgorithmHandlerDefault::append
unsigned int DSIGAlgorithmHandlerDefault::signToSafeBuffer(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
unsigned int outputLength,
safeBuffer & result) const {
@@ -558,7 +558,7 @@ bool DSIGAlgorithmHandlerDefault::verify
const XMLCh * URI,
const char * sig,
unsigned int outputLength,
- XSECCryptoKey * key) const {
+ const XSECCryptoKey * key) const {
signatureMethod sm;
hashMethod hm;
@@ -735,7 +735,7 @@ bool DSIGAlgorithmHandlerDefault::append
unsigned int DSIGAlgorithmHandlerDefault::decryptToSafeBuffer(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
DOMDocument * doc,
safeBuffer & result
) const {
@@ -748,7 +748,7 @@ unsigned int DSIGAlgorithmHandlerDefault
bool DSIGAlgorithmHandlerDefault::appendDecryptCipherTXFM(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc
) const {
@@ -764,7 +764,7 @@ bool DSIGAlgorithmHandlerDefault::append
bool DSIGAlgorithmHandlerDefault::encryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const {
Modified: santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/dsig/DSIGAlgorithmHandlerDefault.hpp Mon Dec 4 22:24:05 2017
@@ -55,13 +55,13 @@ public:
virtual bool appendSignatureHashTxfm(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key
+ const XSECCryptoKey * key
) const;
virtual unsigned int signToSafeBuffer(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
unsigned int outputLength,
safeBuffer & result
) const;
@@ -71,7 +71,7 @@ public:
const XMLCh * URI,
const char * sig,
unsigned int outputLength,
- XSECCryptoKey * key
+ const XSECCryptoKey * key
) const;
virtual bool appendHashTxfm(
@@ -84,7 +84,7 @@ public:
virtual unsigned int decryptToSafeBuffer(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const;
@@ -92,14 +92,14 @@ public:
virtual bool appendDecryptCipherTXFM(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc
) const;
virtual bool encryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const;
Modified: santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHash.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHash.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHash.hpp Mon Dec 4 22:24:05 2017
@@ -83,7 +83,7 @@ public :
* @param key The key the HMAC function should use.
*/
- virtual void setKey(XSECCryptoKey * key) {}
+ virtual void setKey(const XSECCryptoKey * key) {}
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.cpp Mon Dec 4 22:24:05 2017
@@ -122,7 +122,7 @@ void NSSCryptoHashHMAC::reset() {
// Key manipulation
// --------------------------------------------------------------------------------
-void NSSCryptoHashHMAC::setKey(XSECCryptoKey *key) {
+void NSSCryptoHashHMAC::setKey(const XSECCryptoKey *key) {
if (key->getKeyType() != XSECCryptoKey::KEY_HMAC) {
@@ -268,4 +268,4 @@ XSECCryptoHash::HashType NSSCryptoHashHM
}
-#endif /* XSEC_HAVE_NSS */
\ No newline at end of file
+#endif /* XSEC_HAVE_NSS */
Modified: santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/NSS/NSSCryptoHashHMAC.hpp Mon Dec 4 22:24:05 2017
@@ -83,7 +83,7 @@ public :
* @param key The key the HMAC function should use.
*/
- virtual void setKey(XSECCryptoKey * key);
+ virtual void setKey(const XSECCryptoKey * key);
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp Mon Dec 4 22:24:05 2017
@@ -76,7 +76,7 @@ public :
* @param key The key the HMAC function should use.
*/
- virtual void setKey(XSECCryptoKey * key) {}
+ virtual void setKey(const XSECCryptoKey * key) {}
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp Mon Dec 4 22:24:05 2017
@@ -123,7 +123,7 @@ OpenSSLCryptoHashHMAC::OpenSSLCryptoHash
}
-void OpenSSLCryptoHashHMAC::setKey(XSECCryptoKey *key) {
+void OpenSSLCryptoHashHMAC::setKey(const XSECCryptoKey *key) {
// Use this to initialise the HMAC Context
Modified: santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp Mon Dec 4 22:24:05 2017
@@ -93,7 +93,7 @@ public :
* @param key The key the HMAC function should use.
*/
- virtual void setKey(XSECCryptoKey * key);
+ virtual void setKey(const XSECCryptoKey * key);
/**
* \brief Return the string identifier for the OpenSSL interface
Modified: santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHash.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHash.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHash.hpp Mon Dec 4 22:24:05 2017
@@ -92,7 +92,7 @@ public :
* @param key The key the HMAC function should use.
*/
- virtual void setKey(XSECCryptoKey * key) {}
+ virtual void setKey(const XSECCryptoKey * key) {}
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.cpp Mon Dec 4 22:24:05 2017
@@ -136,7 +136,7 @@ void WinCAPICryptoHashHMAC::eraseKeys(vo
}
-void WinCAPICryptoHashHMAC::setKey(XSECCryptoKey *key) {
+void WinCAPICryptoHashHMAC::setKey(const XSECCryptoKey *key) {
BOOL fResult;
Modified: santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/WinCAPI/WinCAPICryptoHashHMAC.hpp Mon Dec 4 22:24:05 2017
@@ -104,7 +104,7 @@ public :
* @param key The key the HMAC function should use.
*/
- virtual void setKey(XSECCryptoKey * key);
+ virtual void setKey(const XSECCryptoKey * key);
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoHash.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoHash.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoHash.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/enc/XSECCryptoHash.hpp Mon Dec 4 22:24:05 2017
@@ -158,7 +158,7 @@ public :
* @param key The key the HMAC function should use.
*/
- virtual void setKey(XSECCryptoKey * key) = 0;
+ virtual void setKey(const XSECCryptoKey * key) = 0;
//@}
Modified: santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmHandler.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmHandler.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmHandler.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/framework/XSECAlgorithmHandler.hpp Mon Dec 4 22:24:05 2017
@@ -116,7 +116,7 @@ public:
virtual bool encryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const = 0;
@@ -151,7 +151,7 @@ public:
virtual unsigned int decryptToSafeBuffer(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const = 0;
@@ -181,7 +181,7 @@ public:
virtual bool appendDecryptCipherTXFM(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc
) const = 0;
@@ -216,7 +216,7 @@ public:
virtual unsigned int signToSafeBuffer(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
unsigned int outputLength,
safeBuffer & result
) const = 0;
@@ -245,7 +245,7 @@ public:
const XMLCh * URI,
const char * sig,
unsigned int outputLength,
- XSECCryptoKey * key
+ const XSECCryptoKey * key
) const = 0;
//@}
@@ -268,7 +268,7 @@ public:
virtual bool appendSignatureHashTxfm(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key
+ const XSECCryptoKey * key
) const = 0;
/**
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.cpp Mon Dec 4 22:24:05 2017
@@ -36,7 +36,7 @@
XERCES_CPP_NAMESPACE_USE
TXFMCipher::TXFMCipher(DOMDocument *doc,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
bool encrypt,
XSECCryptoSymmetricKey::SymmetricKeyMode mode,
unsigned int taglen) :
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMCipher.hpp Mon Dec 4 22:24:05 2017
@@ -49,7 +49,7 @@ public:
// Constructors and destructors
TXFMCipher(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument* doc,
- XSECCryptoKey* key,
+ const XSECCryptoKey* key,
bool encrypt,
XSECCryptoSymmetricKey::SymmetricKeyMode mode = XSECCryptoSymmetricKey::MODE_CBC,
unsigned int taglen = 0);
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.cpp Mon Dec 4 22:24:05 2017
@@ -36,7 +36,7 @@ XERCES_CPP_NAMESPACE_USE
// Standarad includes
-TXFMMD5::TXFMMD5(DOMDocument *doc, XSECCryptoKey * key) :
+TXFMMD5::TXFMMD5(DOMDocument *doc, const XSECCryptoKey * key) :
TXFMBase (doc), mp_h(NULL), md_value(NULL), md_len(0), toOutput(0) {
if (key == NULL)
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMMD5.hpp Mon Dec 4 22:24:05 2017
@@ -53,7 +53,7 @@ private:
public:
- TXFMMD5(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, XSECCryptoKey * key = NULL);
+ TXFMMD5(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, const XSECCryptoKey * key = NULL);
~TXFMMD5();
// Methods to get tranform output type and input requirement
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.cpp Mon Dec 4 22:24:05 2017
@@ -34,7 +34,7 @@
XERCES_CPP_NAMESPACE_USE
-TXFMSHA1::TXFMSHA1(DOMDocument *doc, hashMethod hm, XSECCryptoKey * key) :
+TXFMSHA1::TXFMSHA1(DOMDocument *doc, hashMethod hm, const XSECCryptoKey * key) :
TXFMBase (doc), mp_h(NULL), md_value(NULL), md_len(0), toOutput(0) {
int hashLen = 0;
Modified: santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/transformers/TXFMSHA1.hpp Mon Dec 4 22:24:05 2017
@@ -48,7 +48,7 @@ private:
public:
- TXFMSHA1(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, hashMethod hm = HASH_SHA1, XSECCryptoKey * key = NULL);
+ TXFMSHA1(XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument *doc, hashMethod hm = HASH_SHA1, const XSECCryptoKey * key = NULL);
~TXFMSHA1();
// Methods to get tranform output type and input requirement
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.cpp Mon Dec 4 22:24:05 2017
@@ -80,7 +80,7 @@ unsigned char s_AES_IV [] = {
// --------------------------------------------------------------------------------
void XENCAlgorithmHandlerDefault::mapURIToKey(const XMLCh * uri,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XSECCryptoKey::KeyType &kt,
XSECCryptoSymmetricKey::SymmetricKeyType &skt,
bool &isSymmetricKeyWrap,
@@ -205,7 +205,7 @@ void XENCAlgorithmHandlerDefault::mapURI
unsigned int XENCAlgorithmHandlerDefault::unwrapKeyAES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const {
// Cat the encrypted key
@@ -281,7 +281,7 @@ unsigned int XENCAlgorithmHandlerDefault
bool XENCAlgorithmHandlerDefault::wrapKeyAES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const {
// get the raw key
@@ -377,7 +377,7 @@ bool XENCAlgorithmHandlerDefault::wrapKe
unsigned int XENCAlgorithmHandlerDefault::unwrapKey3DES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const {
// Perform an unwrap on the key
@@ -456,7 +456,7 @@ unsigned int XENCAlgorithmHandlerDefault
bool XENCAlgorithmHandlerDefault::wrapKey3DES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const {
// Cat the plaintext key
@@ -559,7 +559,7 @@ bool XENCAlgorithmHandlerDefault::wrapKe
bool XENCAlgorithmHandlerDefault::appendDecryptCipherTXFM(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc
) const {
@@ -609,7 +609,7 @@ bool XENCAlgorithmHandlerDefault::append
unsigned int XENCAlgorithmHandlerDefault::doGCMDecryptToSafeBuffer(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
unsigned int taglen,
safeBuffer & result) const {
@@ -671,7 +671,7 @@ unsigned int XENCAlgorithmHandlerDefault
unsigned int XENCAlgorithmHandlerDefault::doRSADecryptToSafeBuffer(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
DOMDocument * doc,
safeBuffer & result) const {
@@ -804,7 +804,7 @@ unsigned int XENCAlgorithmHandlerDefault
unsigned int XENCAlgorithmHandlerDefault::decryptToSafeBuffer(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
DOMDocument * doc,
safeBuffer & result
) const {
@@ -902,7 +902,7 @@ unsigned int XENCAlgorithmHandlerDefault
bool XENCAlgorithmHandlerDefault::doRSAEncryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const {
@@ -1045,7 +1045,7 @@ bool XENCAlgorithmHandlerDefault::doRSAE
bool XENCAlgorithmHandlerDefault::encryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const {
@@ -1188,7 +1188,7 @@ XSECAlgorithmHandler * XENCAlgorithmHand
unsigned int XENCAlgorithmHandlerDefault::signToSafeBuffer(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
unsigned int outputLength,
safeBuffer & result) const {
@@ -1201,7 +1201,7 @@ unsigned int XENCAlgorithmHandlerDefault
bool XENCAlgorithmHandlerDefault::appendSignatureHashTxfm(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key) const {
+ const XSECCryptoKey * key) const {
throw XSECException(XSECException::AlgorithmMapperError,
"XENCAlgorithmHandlerDefault - Signature operations not supported");
@@ -1213,7 +1213,7 @@ bool XENCAlgorithmHandlerDefault::verify
const XMLCh * URI,
const char * sig,
unsigned int outputLength,
- XSECCryptoKey * key) const {
+ const XSECCryptoKey * key) const {
throw XSECException(XSECException::AlgorithmMapperError,
"XENCAlgorithmHandlerDefault - Signature operations not supported");
Modified: santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.hpp
URL: http://svn.apache.org/viewvc/santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.hpp?rev=1817135&r1=1817134&r2=1817135&view=diff
==============================================================================
--- santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.hpp (original)
+++ santuario/xml-security-cpp/trunk/xsec/xenc/impl/XENCAlgorithmHandlerDefault.hpp Mon Dec 4 22:24:05 2017
@@ -51,7 +51,7 @@ public:
virtual unsigned int decryptToSafeBuffer(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const;
@@ -59,14 +59,14 @@ public:
virtual bool appendDecryptCipherTXFM(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc
) const;
virtual bool encryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result
) const;
@@ -84,7 +84,7 @@ public:
virtual unsigned int signToSafeBuffer(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
unsigned int outputLength,
safeBuffer & result
) const;
@@ -92,7 +92,7 @@ public:
virtual bool appendSignatureHashTxfm(
TXFMChain * inputBytes,
const XMLCh * URI,
- XSECCryptoKey * key
+ const XSECCryptoKey * key
) const;
virtual bool verifyBase64Signature(
@@ -100,7 +100,7 @@ public:
const XMLCh * URI,
const char * sig,
unsigned int outputLength,
- XSECCryptoKey * key
+ const XSECCryptoKey * key
) const;
virtual bool appendHashTxfm(
@@ -113,7 +113,7 @@ public:
private:
void mapURIToKey(const XMLCh * uri,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XSECCryptoKey::KeyType &kt,
XSECCryptoSymmetricKey::SymmetricKeyType &skt,
bool &isSymmetricKeyWrap,
@@ -123,41 +123,41 @@ private:
unsigned int doRSADecryptToSafeBuffer(
TXFMChain * cipherText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result) const;
bool doRSAEncryptToSafeBuffer(
TXFMChain * plainText,
XENCEncryptionMethod * encryptionMethod,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
XERCES_CPP_NAMESPACE_QUALIFIER DOMDocument * doc,
safeBuffer & result) const;
unsigned int doGCMDecryptToSafeBuffer(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
unsigned int taglen,
safeBuffer & result) const;
unsigned int unwrapKeyAES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const;
unsigned int unwrapKey3DES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const;
bool wrapKeyAES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const;
bool wrapKey3DES(
TXFMChain * cipherText,
- XSECCryptoKey * key,
+ const XSECCryptoKey * key,
safeBuffer & result) const;
};