You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by bl...@apache.org on 2003/06/23 11:58:23 UTC
cvs commit: xml-security/c/src/enc/OpenSSL OpenSSLCryptoBase64.hpp OpenSSLCryptoHash.hpp OpenSSLCryptoHashHMAC.hpp OpenSSLCryptoKeyDSA.hpp OpenSSLCryptoKeyHMAC.hpp OpenSSLCryptoKeyRSA.hpp OpenSSLCryptoProvider.hpp OpenSSLCryptoX509.hpp
blautenb 2003/06/23 02:58:21
Modified: c/src/enc/OpenSSL OpenSSLCryptoBase64.hpp
OpenSSLCryptoHash.hpp OpenSSLCryptoHashHMAC.hpp
OpenSSLCryptoKeyDSA.hpp OpenSSLCryptoKeyHMAC.hpp
OpenSSLCryptoKeyRSA.hpp OpenSSLCryptoProvider.hpp
OpenSSLCryptoX509.hpp
Log:
Ensure OpenSSL is fully commented out if HAVE_OPENSSL not defined
Revision Changes Path
1.4 +4 -3 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoBase64.hpp
Index: OpenSSLCryptoBase64.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoBase64.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSSLCryptoBase64.hpp 15 Jun 2003 09:34:27 -0000 1.3
+++ OpenSSLCryptoBase64.hpp 23 Jun 2003 09:58:21 -0000 1.4
@@ -75,8 +75,8 @@
#include <xsec/enc/XSECCryptoBase64.hpp>
// OpenSSL
-
-#include <openssl/evp.h>
+#if defined (HAVE_OPENSSL)
+# include <openssl/evp.h>
/**
* @ingroup opensslcrypto
@@ -236,4 +236,5 @@
/*\@}*/
+#endif /* HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOBASE64_INCLUDE */
1.4 +5 -2 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHash.hpp
Index: OpenSSLCryptoHash.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHash.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSSLCryptoHash.hpp 15 Jun 2003 09:34:27 -0000 1.3
+++ OpenSSLCryptoHash.hpp 23 Jun 2003 09:58:21 -0000 1.4
@@ -76,7 +76,9 @@
// OpenSSL Includes
-#include <openssl/evp.h>
+#if defined (HAVE_OPENSSL)
+
+# include <openssl/evp.h>
/**
* @ingroup opensslcrypto
@@ -189,4 +191,5 @@
};
+#endif /* HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOHASHSHA1_INCLUDE */
1.5 +3 -2 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp
Index: OpenSSLCryptoHashHMAC.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoHashHMAC.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoHashHMAC.hpp 15 Jun 2003 09:34:27 -0000 1.4
+++ OpenSSLCryptoHashHMAC.hpp 23 Jun 2003 09:58:21 -0000 1.5
@@ -76,6 +76,7 @@
#include <xsec/utils/XSECSafeBuffer.hpp>
// OpenSSL Includes
+#if defined (HAVE_OPENSSL)
#include <openssl/evp.h>
#include <openssl/hmac.h>
@@ -215,5 +216,5 @@
bool m_initialised;
};
-
+#endif /* HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOHASHHMAC_INCLUDE */
1.5 +3 -1 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp
Index: OpenSSLCryptoKeyDSA.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyDSA.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoKeyDSA.hpp 15 Jun 2003 09:34:27 -0000 1.4
+++ OpenSSLCryptoKeyDSA.hpp 23 Jun 2003 09:58:21 -0000 1.5
@@ -73,6 +73,7 @@
#include <xsec/enc/XSECCryptoKeyDSA.hpp>
+#if defined (HAVE_OPENSSL)
#include <openssl/evp.h>
/**
@@ -252,4 +253,5 @@
};
+#endif /* HAVE_OPENSSL */
#endif /* XSECCRYPTOKEYDSA_INCLUDE */
1.5 +5 -1 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp
Index: OpenSSLCryptoKeyHMAC.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyHMAC.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoKeyHMAC.hpp 15 Jun 2003 09:34:27 -0000 1.4
+++ OpenSSLCryptoKeyHMAC.hpp 23 Jun 2003 09:58:21 -0000 1.5
@@ -73,6 +73,8 @@
#include <xsec/enc/XSECCryptoKeyHMAC.hpp>
+#if defined (HAVE_OPENSSL)
+
/**
* \ingroup opensslcrypto
* @{
@@ -166,5 +168,7 @@
safeBuffer m_keyBuf;
unsigned int m_keyLen;
};
+
+#endif /* HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOKEYHMAC_INCLUDE */
1.5 +3 -1 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp
Index: OpenSSLCryptoKeyRSA.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoKeyRSA.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoKeyRSA.hpp 15 Jun 2003 09:34:27 -0000 1.4
+++ OpenSSLCryptoKeyRSA.hpp 23 Jun 2003 09:58:21 -0000 1.5
@@ -73,6 +73,7 @@
#include <xsec/enc/XSECCryptoKeyRSA.hpp>
+#if defined (HAVE_OPENSSL)
#include <openssl/evp.h>
/**
@@ -221,4 +222,5 @@
};
+#endif /* HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOKEYRSA_INCLUDE */
1.5 +4 -1 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp
Index: OpenSSLCryptoProvider.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoProvider.hpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- OpenSSLCryptoProvider.hpp 15 Jun 2003 09:34:27 -0000 1.4
+++ OpenSSLCryptoProvider.hpp 23 Jun 2003 09:58:21 -0000 1.5
@@ -74,6 +74,8 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoProvider.hpp>
+#if defined (HAVE_OPENSSL)
+
/**
* @defgroup opensslcrypto OpenSSL Interface
* @ingroup crypto
@@ -221,4 +223,5 @@
};
+#endif /* HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOPROVIDER_INCLUDE */
1.4 +3 -4 xml-security/c/src/enc/OpenSSL/OpenSSLCryptoX509.hpp
Index: OpenSSLCryptoX509.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/enc/OpenSSL/OpenSSLCryptoX509.hpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OpenSSLCryptoX509.hpp 15 Jun 2003 09:34:27 -0000 1.3
+++ OpenSSLCryptoX509.hpp 23 Jun 2003 09:58:21 -0000 1.4
@@ -64,9 +64,7 @@
*
* Author(s): Berin Lautenbach
*
- * $ID$
- *
- * $LOG$
+ * $Id$
*
*/
@@ -76,6 +74,7 @@
#include <xsec/framework/XSECDefs.hpp>
#include <xsec/enc/XSECCryptoX509.hpp>
+#if defined (HAVE_OPENSSL)
#include <openssl/x509.h>
#include <openssl/bio.h>
@@ -169,6 +168,6 @@
safeBuffer m_DERX509;
};
-
+#endif /* HAVE_OPENSSL */
#endif /* OPENSSLCRYPTOX509_INCLUDE */