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

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

diff --git a/xmltooling/security/XSECCryptoX509CRL.h b/xmltooling/security/XSECCryptoX509CRL.h
index fd67f20..afe6ee8 100644 (file)
--- a/xmltooling/security/XSECCryptoX509CRL.h
+++ b/xmltooling/security/XSECCryptoX509CRL.h
@@ -1,17 +1,21 @@
-/*
- * Copyright 2006 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.
  */
 
 /**
@@ -36,9 +40,9 @@ namespace xmltooling {
     class XMLTOOL_API XSECCryptoX509CRL {
         MAKE_NONCOPYABLE(XSECCryptoX509CRL);
     protected:
-        XSECCryptoX509CRL() {}
+        XSECCryptoX509CRL();
     public:
-       virtual ~XSECCryptoX509CRL() {}
+       virtual ~XSECCryptoX509CRL();
     
        /**
         * Returns a string that identifies the crypto owner of this library.
@@ -47,14 +51,6 @@ namespace xmltooling {
         */
        virtual const XMLCh* getProviderName() const=0;
     
-       /**
-        * Load a CRL into the object.
-        * Takes a base64 DER-encoded CRL and loads it.
-        *
-        * @param buf buffer containing the Base64 encoded CRL
-        * @param len number of bytes of data in the CRL buffer
-        */
-    
         /**
          * Returns a duplicate of the original object.
          *
@@ -62,13 +58,17 @@ namespace xmltooling {
          */
         virtual XSECCryptoX509CRL* clone() const=0;
 
+        /**
+         * Load a Base64-encoded CRL into the object.
+         *
+         * @param buf buffer containing the base64-encoded CRL
+         * @param len number of bytes of data in the CRL buffer (0 if the string is null terminated)
+         */
        virtual void loadX509CRLBase64Bin(const char* buf, unsigned int len)=0;
     
        /**
         * Load a PEM encoded CRL into the object.
         *
-        * Takes a PEM encoded CRL and loads it.
-        *
         * @param buf buffer containing the PEM encoded CRL
         * @param len number of bytes of data in the CRL buffer (0 if the string is null terminated)
         */