Merge branch '1.x' of ssh://authdev.it.ohio-state.edu/~scantor/git/cpp-xmltooling...

[shibboleth/cpp-xmltooling.git] / xmltooling / security / impl / XSECCryptoX509CRL.cpp

diff --git a/xmltooling/security/impl/XSECCryptoX509CRL.cpp b/xmltooling/security/impl/XSECCryptoX509CRL.cpp
index 8111609..2d2a280 100644 (file)
--- a/xmltooling/security/impl/XSECCryptoX509CRL.cpp
+++ b/xmltooling/security/impl/XSECCryptoX509CRL.cpp
@@ -1,17 +1,21 @@
-/*
- * Copyright 2001-2009 The Apache Software Foundation.
+/**
+ * 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.
  *
- * 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
+ * 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.
  */
 
 /**
@@ -39,7 +43,7 @@ XSECCryptoX509CRL::~XSECCryptoX509CRL()
 void XSECCryptoX509CRL::loadX509CRLPEM(const char* buf, unsigned int len)
 {
        const char * b;
-       char * b1 = NULL;
+       char * b1 = nullptr;
        if (len == 0)
                b = buf;
        else {
@@ -51,9 +55,9 @@ void XSECCryptoX509CRL::loadX509CRLPEM(const char* buf, unsigned int len)
 
        const char *p = strstr(buf, "-----BEGIN X509 CRL-----");
 
-       if (p == NULL) {
+       if (p == nullptr) {
 
-               if (b1 != NULL)
+               if (b1 != nullptr)
                        delete[] b1;
 
                throw XSECCryptoException(XSECCryptoException::X509Error,
@@ -75,7 +79,7 @@ void XSECCryptoX509CRL::loadX509CRLPEM(const char* buf, unsigned int len)
 
        if (strstr(p, "-----END X509 CRL-----") != p) {
 
-               if (b1 != NULL)
+               if (b1 != nullptr)
                        delete[] b1;
 
                throw XSECCryptoException(XSECCryptoException::X509Error,
@@ -83,7 +87,7 @@ void XSECCryptoX509CRL::loadX509CRLPEM(const char* buf, unsigned int len)
 
        }
        
-       if (b1 != NULL)
+       if (b1 != nullptr)
                delete[] b1;
 
        output[i] = '\0';