Fix incorrect RSA key size calculation, and reduce extra calls to that method.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-xmltooling/branches/REL_1@781 de75baf8-a10c-0410-a50a-987c0e22f00f

diff --git a/xmltooling/security/impl/CredentialCriteria.cpp b/xmltooling/security/impl/CredentialCriteria.cpp
index c5a31e5..b3b4ed2 100644 (file)
--- a/xmltooling/security/impl/CredentialCriteria.cpp
+++ b/xmltooling/security/impl/CredentialCriteria.cpp
@@ -239,19 +239,20 @@ bool CredentialCriteria::matches(const Credential& credential) const
     }
 
     // KeySize check, if specified and we have one.
-    if (credential.getKeySize() > 0) {
+    unsigned int ksize = credential.getKeySize();
+    if (ksize > 0) {
         if (m_keySize > 0 && m_maxKeySize == 0) {
-            if (credential.getKeySize() != m_keySize) {
-                log.debug("key size (%u) didn't match (%u)", credential.getKeySize(), m_keySize);
+            if (ksize != m_keySize) {
+                log.debug("key size (%u) didn't match (%u)", ksize, m_keySize);
                 return false;
             }
         }
-        else if (m_keySize > 0 && credential.getKeySize() < m_keySize) {
-            log.debug("key size (%u) smaller than minimum (%u)", credential.getKeySize(), m_keySize);
+        else if (m_keySize > 0 && ksize < m_keySize) {
+            log.debug("key size (%u) smaller than minimum (%u)", ksize, m_keySize);
             return false;
         }
-        else if (m_maxKeySize > 0 && credential.getKeySize() > m_maxKeySize) {
-            log.debug("key size (%u) larger than maximum (%u)", credential.getKeySize(), m_maxKeySize);
+        else if (m_maxKeySize > 0 && ksize > m_maxKeySize) {
+            log.debug("key size (%u) larger than maximum (%u)", ksize, m_maxKeySize);
             return false;
         }
     }