Add licenses, remove dependency on OpenSSL.

diff --git a/.gitignore b/.gitignore
index 15ded4b..97af174 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@
 /pkginfo
 /stamp-h1
 /.settings
+/doxyfile

diff --git a/Makefile.am b/Makefile.am
index 5cb4979..1031c79 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,10 @@ all-local: opensaml.spec pkginfo
 
 if DX_COND_doc
 all-local: doxygen-doc
+
+install-data-hook:
+       rm -rf $(prefix)/doc/@PACKAGE@/api
+       cp -r doc/api $(prefix)/doc/@PACKAGE@
 endif
 
 opensaml.spec: opensaml.spec.in Makefile

diff --git a/saml/SAMLConfig.cpp b/saml/SAMLConfig.cpp
index a03b172..570ba1a 100644 (file)
--- a/saml/SAMLConfig.cpp
+++ b/saml/SAMLConfig.cpp
@@ -45,7 +45,6 @@
 #include <xsec/enc/XSECCryptoException.hpp>
 #include <xsec/enc/XSECCryptoProvider.hpp>
 #include <xsec/utils/XSECPlatformUtils.hpp>
-#include <openssl/err.h>
 
 using namespace opensaml;
 using namespace xmlsignature;
@@ -216,22 +215,6 @@ string SAMLInternalConfig::hashSHA1(const char* s, bool toHex)
     throw XMLSecurityException("Unable to generate SHA-1 hash.");
 }
 
-void opensaml::log_openssl()
-{
-    const char* file;
-    const char* data;
-    int flags,line;
-
-    unsigned long code=ERR_get_error_line_data(&file,&line,&data,&flags);
-    while (code) {
-        Category& log=Category::getInstance("OpenSSL");
-        log.errorStream() << "error code: " << code << " in " << file << ", line " << line << CategoryStream::ENDLINE;
-        if (data && (flags & ERR_TXT_STRING))
-            log.errorStream() << "error data: " << data << CategoryStream::ENDLINE;
-        code=ERR_get_error_line_data(&file,&line,&data,&flags);
-    }
-}
-
 using namespace saml2md;
 
 void opensaml::annotateException(XMLToolingException* e, const EntityDescriptor* entity, bool rethrow)

diff --git a/saml/internal.h b/saml/internal.h
index 3999273..e4d5bcc 100644 (file)
--- a/saml/internal.h
+++ b/saml/internal.h
@@ -100,8 +100,6 @@ namespace opensaml {
         std::string hashSHA1(const char* data, bool toHex=false);
     private:
     };
-
-    void log_openssl();
     /// @endcond
 
 };

diff --git a/saml/saml.vcproj b/saml/saml.vcproj
index 9c0f39e..0069ba2 100644 (file)
--- a/saml/saml.vcproj
+++ b/saml/saml.vcproj
@@ -61,7 +61,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4cppD.lib libeay32_0_9_8D.lib"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\Debug\xmltooling1D.lib xerces-c_2D.lib xsec_1D.lib log4cppD.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)2_0D.dll"\r
                                LinkIncremental="2"\r
                                GenerateDebugInformation="true"\r
@@ -137,7 +137,7 @@
                        />\r
                        <Tool\r
                                Name="VCLinkerTool"\r
-                               AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4cpp.lib libeay32_0_9_8.lib"\r
+                               AdditionalDependencies="..\..\cpp-xmltooling\Release\xmltooling1.lib xerces-c_2.lib xsec_1.lib log4cpp.lib"\r
                                OutputFile="$(OutDir)\$(ProjectName)2_0.dll"\r
                                LinkIncremental="1"\r
                                GenerateDebugInformation="true"\r

diff --git a/saml/util/CGIParser.h b/saml/util/CGIParser.h
index e1980fa..00ea7c1 100644 (file)
--- a/saml/util/CGIParser.h
+++ b/saml/util/CGIParser.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * @file shibsp/util/CGIParser.h
+ * @file saml/util/CGIParser.h
  * 
  * CGI GET/POST parameter parsing
  */

diff --git a/saml/version.h b/saml/version.h
index b8581a0..fb81007 100644 (file)
--- a/saml/version.h
+++ b/saml/version.h
@@ -15,7 +15,7 @@
  */
 
 /**
- * version.h
+ * saml/version.h
  * 
  * Library version macros and constants 
  */