blautenb 2003/04/11 05:26:27
Modified: c/src/enc/OpenSSL OpenSSLCryptoBase64.cpp
OpenSSLCryptoHash.cpp OpenSSLCryptoHashHMAC.cpp
OpenSSLCryptoKeyDSA.cpp OpenSSLCryptoKeyHMAC.cpp
OpenSSLCryptoKeyRSA.cpp OpenSSLCryptoProvider.cpp
OpenSSLCryptoX509.cpp
Log:
Updates to support disabling of OpenSSL layer when library not available
Revision Changes Path
1.3 +4 -0 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoBase64.cpp
Index: OpenSSLCryptoBase64.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoBase64.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenSSLCryptoBase64.cpp 9 Feb 2003 11:13:49 -0000 1.2
+++ OpenSSLCryptoBase64.cpp 11 Apr 2003 12:26:26 -0000 1.3
@@ -70,6 +70,9 @@
*
*/
+#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
+
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
@@ -225,3 +228,4 @@
}
+#endif /* HAVE_OPENSSL */
1.4 +5 -3 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHash.cpp
Index: OpenSSLCryptoHash.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHash.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSSLCryptoHash.cpp 30 Mar 2003 06:57:12 -0000 1.3
+++ OpenSSLCryptoHash.cpp 11 Apr 2003 12:26:26 -0000 1.4
@@ -64,12 +64,13 @@
*
* Author(s): Berin Lautenbach
*
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
+#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
+
#include <xsec/enc/OpenSSL/OpenSSLCryptoHash.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
@@ -152,3 +153,4 @@
}
+#endif /* HAVE_OPENSSL */
\ No newline at end of file
1.4 +6 -3 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp
Index: OpenSSLCryptoHashHMAC.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSSLCryptoHashHMAC.cpp 30 Mar 2003 06:57:12 -0000 1.3
+++ OpenSSLCryptoHashHMAC.cpp 11 Apr 2003 12:26:26 -0000 1.4
@@ -64,12 +64,14 @@
*
* Author(s): Berin Lautenbach
*
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
+#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
+
+
#include <xsec/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/enc/XSECCryptoKeyHMAC.hpp>
@@ -189,3 +191,4 @@
}
+#endif /* HAVE_OPENSSL */
1.4 +5 -16 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp
Index: OpenSSLCryptoKeyDSA.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSSLCryptoKeyDSA.cpp 22 Feb 2003 08:47:24 -0000 1.3
+++ OpenSSLCryptoKeyDSA.cpp 11 Apr 2003 12:26:26 -0000 1.4
@@ -67,6 +67,8 @@
* $Id$
*
*/
+#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
@@ -202,21 +204,6 @@
int sigValLen;
int err;
-
- /*
- BIO * b64 = BIO_new(BIO_f_base64());
- BIO * bmem = BIO_new(BIO_s_mem());
-
- BIO_set_mem_eof_return(bmem, 0);
- b64 = BIO_push(b64, bmem);
-
- // Translate signature from Base64
-
- BIO_write(bmem, base64Signature, sigLen);
- sigValLen = BIO_read(b64, sigVal, 512);
-
- */
-
EVP_ENCODE_CTX m_dctx;
int rc;
@@ -382,3 +369,5 @@
return ret;
}
+
+#endif /* HAVE_OPENSSL */
\ No newline at end of file
1.3 +5 -3 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp
Index: OpenSSLCryptoKeyHMAC.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OpenSSLCryptoKeyHMAC.cpp 9 Feb 2003 11:13:49 -0000 1.2
+++ OpenSSLCryptoKeyHMAC.cpp 11 Apr 2003 12:26:26 -0000 1.3
@@ -64,12 +64,13 @@
*
* Author(s): Berin Lautenbach
*
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
+#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
+
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp>
#include <xsec/framework/XSECError.hpp>
@@ -106,3 +107,4 @@
}
+#endif /* HAVE_OPENSSL */
1.5 +6 -1 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp
Index: OpenSSLCryptoKeyRSA.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoKeyRSA.cpp 1 Mar 2003 06:27:28 -0000 1.4
+++ OpenSSLCryptoKeyRSA.cpp 11 Apr 2003 12:26:26 -0000 1.5
@@ -68,6 +68,9 @@
*
*/
+#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
+
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoBase64.hpp>
#include <xsec/enc/XSECCryptoException.hpp>
@@ -398,3 +401,5 @@
return ret;
}
+
+#endif /* HAVE_OPENSSL */
1.5 +6 -1 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp
Index: OpenSSLCryptoProvider.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoProvider.cpp 30 Mar 2003 06:57:12 -0000 1.4
+++ OpenSSLCryptoProvider.cpp 11 Apr 2003 12:26:26 -0000 1.5
@@ -68,6 +68,9 @@
*
*/
+#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
+
#include <xsec/framework/XSECError.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoProvider.hpp>
@@ -171,3 +174,5 @@
return ret;
}
+
+#endif /* HAVE_OPENSSL */
1.5 +5 -2 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp
Index: OpenSSLCryptoX509.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoX509.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoX509.cpp 18 Mar 2003 11:11:25 -0000 1.4
+++ OpenSSLCryptoX509.cpp 11 Apr 2003 12:26:26 -0000 1.5
@@ -69,6 +69,9 @@
*/
#include <xsec/framework/XSECDefs.hpp>
+#if defined (HAVE_OPENSSL)
+
+#include <xsec/framework/XSECDefs.hpp>
#include <xsec/framework/XSECError.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoX509.hpp>
#include <xsec/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp>
@@ -269,4 +272,4 @@
}
-
+#endif /* HAVE_OPENSSL */
