From 88c2863533c71b4d2e09ff1d1a7c1ef0a69b799f Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Mon, 2 Nov 2009 16:38:02 +0000 Subject: [PATCH] Clean up hash options in DER API. --- shibsp/attribute/KeyInfoAttributeDecoder.cpp | 2 +- shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shibsp/attribute/KeyInfoAttributeDecoder.cpp b/shibsp/attribute/KeyInfoAttributeDecoder.cpp index 182e082..b566302 100644 --- a/shibsp/attribute/KeyInfoAttributeDecoder.cpp +++ b/shibsp/attribute/KeyInfoAttributeDecoder.cpp @@ -59,7 +59,7 @@ namespace shibsp { if (!alg || !*alg) alg = "SHA1"; dest.push_back(string()); - dest.back() = SecurityHelper::getDEREncoding(*cred.get(), m_hash, true, alg); + dest.back() = SecurityHelper::getDEREncoding(*cred.get(), m_hash ? alg : NULL); if (dest.back().empty()) dest.pop_back(); } diff --git a/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp b/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp index 9729e82..0cb4142 100644 --- a/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp +++ b/shibsp/attribute/resolver/impl/KeyDescriptorAttributeExtractor.cpp @@ -142,7 +142,7 @@ void KeyDescriptorExtractor::extractAttributes( for (vector::const_iterator c = creds.begin(); c != creds.end(); ++c) { if (vals.empty() || !vals.back().empty()) vals.push_back(string()); - vals.back() = SecurityHelper::getDEREncoding(*(*c), true, true, alg); + vals.back() = SecurityHelper::getDEREncoding(*(*c), alg); } if (vals.back().empty()) vals.pop_back(); -- 2.1.4