[cpp-xmltooling] branch master updated: Add const qualifier to alg handler.

Scott Cantor cantor.2 at osu.edu
Tue Mar 6 15:34:05 EST 2018


This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository cpp-xmltooling.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-xmltooling.git;a=commit;h=33c4c2fdbd0a7235f6fc80352d394ae01315cd45

The following commit(s) were added to refs/heads/master by this push:
       new  33c4c2f   Add const qualifier to alg handler.
33c4c2f is described below

commit 33c4c2fdbd0a7235f6fc80352d394ae01315cd45
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Mar 6 15:33:59 2018 -0500

    Add const qualifier to alg handler.
---
 xmltooling/encryption/impl/Decrypter.cpp          | 2 +-
 xmltooling/encryption/impl/Encrypter.cpp          | 2 +-
 xmltooling/signature/impl/XMLSecSignatureImpl.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xmltooling/encryption/impl/Decrypter.cpp b/xmltooling/encryption/impl/Decrypter.cpp
index 7be5b55..a31a107 100644
--- a/xmltooling/encryption/impl/Decrypter.cpp
+++ b/xmltooling/encryption/impl/Decrypter.cpp
@@ -294,7 +294,7 @@ XSECCryptoKey* Decrypter::decryptKey(const EncryptedKey& encryptedKey, const XML
     if (encryptedKey.getDOM()==nullptr)
         throw DecryptionException("The object must be marshalled before decryption.");
 
-    XSECAlgorithmHandler* handler;
+    const XSECAlgorithmHandler* handler;
     try {
         handler = XSECPlatformUtils::g_algorithmMapper->mapURIToHandler(algorithm);
         if (!handler)
diff --git a/xmltooling/encryption/impl/Encrypter.cpp b/xmltooling/encryption/impl/Encrypter.cpp
index 2883509..1f3b458 100644
--- a/xmltooling/encryption/impl/Encrypter.cpp
+++ b/xmltooling/encryption/impl/Encrypter.cpp
@@ -102,7 +102,7 @@ void Encrypter::checkParams(EncryptionParams& encParams, KeyEncryptionParams* ke
     }
     else {
         // We have to have a raw key now, so we need to build a wrapper around it.
-        XSECAlgorithmHandler* handler =XSECPlatformUtils::g_algorithmMapper->mapURIToHandler(encParams.m_algorithm);
+        const XSECAlgorithmHandler* handler =XSECPlatformUtils::g_algorithmMapper->mapURIToHandler(encParams.m_algorithm);
         if (handler != nullptr)
             key = handler->createKeyForURI(
                 encParams.m_algorithm,const_cast<unsigned char*>(encParams.m_keyBuffer),encParams.m_keyBufferSize
diff --git a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
index b40d9c5..43faa90 100644
--- a/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
+++ b/xmltooling/signature/impl/XMLSecSignatureImpl.cpp
@@ -515,7 +515,7 @@ unsigned int Signature::createRawSignature(
     )
 {
     try {
-        XSECAlgorithmHandler* handler = XSECPlatformUtils::g_algorithmMapper->mapURIToHandler(sigAlgorithm);
+        const XSECAlgorithmHandler* handler = XSECPlatformUtils::g_algorithmMapper->mapURIToHandler(sigAlgorithm);
         if (!handler) {
             auto_ptr_char alg(sigAlgorithm);
             throw SignatureException("Unsupported signature algorithm ($1).", params(1,alg.get()));
@@ -561,7 +561,7 @@ bool Signature::verifyRawSignature(
     )
 {
     try {
-        XSECAlgorithmHandler* handler = XSECPlatformUtils::g_algorithmMapper->mapURIToHandler(sigAlgorithm);
+        const XSECAlgorithmHandler* handler = XSECPlatformUtils::g_algorithmMapper->mapURIToHandler(sigAlgorithm);
         if (!handler) {
             auto_ptr_char alg(sigAlgorithm);
             throw SignatureException("Unsupported signature algorithm ($1).", params(1,alg.get()));

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list