gcc const fix, converted linefeeds

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

diff --git a/xmltooling/security/impl/XSECCryptoX509CRL.cpp b/xmltooling/security/impl/XSECCryptoX509CRL.cpp
index 0c8eea8..e009f58 100644 (file)
--- a/xmltooling/security/impl/XSECCryptoX509CRL.cpp
+++ b/xmltooling/security/impl/XSECCryptoX509CRL.cpp
@@ -1,86 +1,86 @@
-/*\r
- * Copyright 2006 The Apache Software Foundation.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- *     http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-\r
-/**\r
- * XSECCryptoX509CRL.cpp\r
- * \r
- * Wrapper for X.509 CRL objects, similar to existing XSEC wrappers.\r
- */\r
-\r
-#include "internal.h"\r
-#include "security/XSECCryptoX509CRL.h"\r
-\r
-#include <xsec/framework/XSECError.hpp>\r
-#include <xsec/enc/XSECCryptoException.hpp>\r
-\r
-using namespace xmltooling;\r
-\r
-void XSECCryptoX509CRL::loadX509CRLPEM(const char* buf, unsigned int len)\r
-{\r
-       const char * b;\r
-       char * b1 = NULL;\r
-       if (len == 0)\r
-               b = buf;\r
-       else {\r
-               XSECnew(b1, char[len+1]);\r
-               memcpy(b1, buf, len);\r
-               b1[len] = '\0';\r
-               b = b1;\r
-       }\r
-\r
-       const char *p = strstr(buf, "-----BEGIN X509 CRL-----");\r
-\r
-       if (p == NULL) {\r
-\r
-               if (b1 != NULL)\r
-                       delete[] b1;\r
-\r
-               throw XSECCryptoException(XSECCryptoException::X509Error,\r
-               "X509CRL::loadX509CRLPEM - Cannot find start of PEM CRL");\r
-\r
-       }\r
-\r
-       p += strlen("-----BEGIN X509 CRL-----");\r
-\r
-       while (*p == '\n' || *p == '\r' || *p == '-')\r
-               p++;\r
-\r
-       safeBuffer output;\r
-       int i = 0;\r
-       while (*p != '\0' && *p != '-') {\r
-               output[i++] = *p;\r
-               ++p;\r
-       }\r
-\r
-       if (strstr(p, "-----END X509 CRL-----") != p) {\r
-\r
-               if (b1 != NULL)\r
-                       delete[] b1;\r
-\r
-               throw XSECCryptoException(XSECCryptoException::X509Error,\r
-               "X509CRL::loadX509PEMCRL - Cannot find end of PEM certificate");\r
-\r
-       }\r
-       \r
-       if (b1 != NULL)\r
-               delete[] b1;\r
-\r
-       output[i] = '\0';\r
-\r
-       this->loadX509CRLBase64Bin(output.rawCharBuffer(), i);\r
-\r
-}\r
-\r
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * 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
+ *
+ *     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.
+ */
+
+/**
+ * XSECCryptoX509CRL.cpp
+ * 
+ * Wrapper for X.509 CRL objects, similar to existing XSEC wrappers.
+ */
+
+#include "internal.h"
+#include "security/XSECCryptoX509CRL.h"
+
+#include <xsec/framework/XSECError.hpp>
+#include <xsec/enc/XSECCryptoException.hpp>
+
+using namespace xmltooling;
+
+void XSECCryptoX509CRL::loadX509CRLPEM(const char* buf, unsigned int len)
+{
+       const char * b;
+       char * b1 = NULL;
+       if (len == 0)
+               b = buf;
+       else {
+               XSECnew(b1, char[len+1]);
+               memcpy(b1, buf, len);
+               b1[len] = '\0';
+               b = b1;
+       }
+
+       const char *p = strstr(buf, "-----BEGIN X509 CRL-----");
+
+       if (p == NULL) {
+
+               if (b1 != NULL)
+                       delete[] b1;
+
+               throw XSECCryptoException(XSECCryptoException::X509Error,
+               "X509CRL::loadX509CRLPEM - Cannot find start of PEM CRL");
+
+       }
+
+       p += strlen("-----BEGIN X509 CRL-----");
+
+       while (*p == '\n' || *p == '\r' || *p == '-')
+               p++;
+
+       safeBuffer output;
+       int i = 0;
+       while (*p != '\0' && *p != '-') {
+               output[i++] = *p;
+               ++p;
+       }
+
+       if (strstr(p, "-----END X509 CRL-----") != p) {
+
+               if (b1 != NULL)
+                       delete[] b1;
+
+               throw XSECCryptoException(XSECCryptoException::X509Error,
+               "X509CRL::loadX509PEMCRL - Cannot find end of PEM certificate");
+
+       }
+       
+       if (b1 != NULL)
+               delete[] b1;
+
+       output[i] = '\0';
+
+       this->loadX509CRLBase64Bin(output.rawCharBuffer(), i);
+
+}
+