Replace license header, remove stale pkg files.

[shibboleth/cpp-xmltooling.git] / xmltooling / signature / impl / SignatureValidator.cpp

diff --git a/xmltooling/signature/impl/SignatureValidator.cpp b/xmltooling/signature/impl/SignatureValidator.cpp
index 3fbd883..f69d299 100644 (file)
--- a/xmltooling/signature/impl/SignatureValidator.cpp
+++ b/xmltooling/signature/impl/SignatureValidator.cpp
@@ -1,17 +1,21 @@
-/*
- *  Copyright 2001-2007 Internet2
- * 
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+/**
+ * Licensed to the University Corporation for Advanced Internet
+ * Development, Inc. (UCAID) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for
+ * additional information regarding copyright ownership.
+ *
+ * UCAID licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License. You may obtain a copy of the
+ * License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the License.
  */
 
 /**
@@ -32,11 +36,11 @@ using namespace xmlsignature;
 using namespace xmltooling;
 using namespace std;
 
-SignatureValidator::SignatureValidator(XSECCryptoKey* key) : m_key(key), m_credential(NULL)
+SignatureValidator::SignatureValidator(XSECCryptoKey* key) : m_key(key), m_credential(nullptr)
 {
 }
 
-SignatureValidator::SignatureValidator(const Credential* credential) : m_key(NULL), m_credential(credential)
+SignatureValidator::SignatureValidator(const Credential* credential) : m_key(nullptr), m_credential(credential)
 {
 }
 
@@ -47,12 +51,12 @@ SignatureValidator::~SignatureValidator()
 void SignatureValidator::setKey(XSECCryptoKey* key)
 {
     m_key = key;
-    m_credential = NULL;
+    m_credential = nullptr;
 }
 
 void SignatureValidator::setCredential(const Credential* credential)
 {
-    m_key = NULL;
+    m_key = nullptr;
     m_credential = credential;
 }
 
@@ -72,7 +76,7 @@ void SignatureValidator::validate(const Signature* sigObj) const
     else if (!m_key && !m_credential)
         throw ValidationException("No Credential or key set on Validator.");
 
-    XSECCryptoKey* key = m_key ? m_key : (m_credential ? m_credential->getPublicKey() : NULL);
+    XSECCryptoKey* key = m_key ? m_key : (m_credential ? m_credential->getPublicKey() : nullptr);
     if (!key)
         throw ValidationException("Credential did not contain a verification key.");