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 2005/02/19 04:37:49 UTC
cvs commit: xml-security/c/src/tools/checksig InteropResolver.cpp
blautenb 2005/02/18 19:37:48
Modified: c/src configure configure.ac
c/src/enc/OpenSSL OpenSSLCryptoKeyDSA.cpp
OpenSSLCryptoKeyRSA.cpp OpenSSLCryptoX509.cpp
c/src/framework XSECConfig.hpp.in
c/src/tools/checksig InteropResolver.cpp
Log:
Updates to link against openssl-0.9.8-dev snapshot 20050217
Revision Changes Path
1.30 +55 -1 xml-security/c/src/configure
Index: configure
===================================================================
RCS file: /home/cvs/xml-security/c/src/configure,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- configure 5 Dec 2004 02:52:19 -0000 1.29
+++ configure 19 Feb 2005 03:37:48 -0000 1.30
@@ -4059,7 +4059,7 @@
CC1="${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
CC4="${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"
MAKE_SHARED="${CXX} ${CXXFLAGS} -Wl,-soname,\$(LIBNAME) -DLINUX -shared ${PIC}"
- LINK="${CXX} ${CXXFLAGS} -DLINUX ${PIC}"
+ LINK="${CXX} ${CXXFLAGS} -DLINUX -ldl ${PIC}"
LINK_COMMAND_1="(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"
LINK_COMMAND_2="(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"
INSTALL_COMMAND_1="\$(INSTALL) \${THISLIB} \${libdir}"
@@ -5320,6 +5320,60 @@
fi
+echo "$as_me:$LINENO: checking for const input buffer in loadX509Base64Bin" >&5
+echo $ECHO_N "checking for const input buffer in loadX509Base64Bin... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <openssl/x509.h>
+int
+main ()
+{
+ const unsigned char * buf;
+ d2i_X509(NULL, &buf, 1);
+
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+ cat >>confdefs.h <<\_ACEOF
+#define XSEC_OPENSSL_D2IX509_CONST_BUFFER 1
+_ACEOF
+
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
# Build the object file lists necessary to link the library
# At the same time, build the include list
1.31 +9 -1 xml-security/c/src/configure.ac
Index: configure.ac
===================================================================
RCS file: /home/cvs/xml-security/c/src/configure.ac,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- configure.ac 3 Feb 2005 10:08:01 -0000 1.30
+++ configure.ac 19 Feb 2005 03:37:48 -0000 1.31
@@ -243,7 +243,7 @@
CC1=["${CXX} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
CC4=["${CC} ${CXXFLAGS} ${PLATFORM_OPTIONS}"]
MAKE_SHARED=["${CXX} ${CXXFLAGS} -Wl,-soname,\$(LIBNAME) -DLINUX -shared ${PIC}"]
- LINK=["${CXX} ${CXXFLAGS} -DLINUX ${PIC}"]
+ LINK=["${CXX} ${CXXFLAGS} -DLINUX -ldl ${PIC}"]
LINK_COMMAND_1=["(cd \$(LIB_DIR) ; rm -f \$(LIBMAJORNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBMAJORNAME))"]
LINK_COMMAND_2=["(cd \$(LIB_DIR) ; rm -f \$(LIBSHORTNAME) ; \$(LN_S) \$(LIBNAME) \$(LIBSHORTNAME))"]
INSTALL_COMMAND_1=["\$(INSTALL) \${THISLIB} \${libdir}"]
@@ -638,6 +638,14 @@
[AC_DEFINE(XSEC_OPENSSL_CANSET_PADDING)],
,[#include <openssl/evp.h>])
+AC_MSG_CHECKING([for const input buffer in loadX509Base64Bin])
+AC_TRY_COMPILE([#include <openssl/x509.h>],
+ [ const unsigned char * buf;
+ d2i_X509(NULL, &buf, 1);
+ ],
+ [AC_MSG_RESULT([yes])]
+ [AC_DEFINE(XSEC_OPENSSL_D2IX509_CONST_BUFFER)],
+ [AC_MSG_RESULT([no])])
# Build the object file lists necessary to link the library
# At the same time, build the include list
1.10 +4 -2 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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- OpenSSLCryptoKeyDSA.cpp 3 Feb 2005 13:13:08 -0000 1.9
+++ OpenSSLCryptoKeyDSA.cpp 19 Feb 2005 03:37:48 -0000 1.10
@@ -32,6 +32,8 @@
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/framework/XSECError.hpp>
+#include <openssl/dsa.h>
+
OpenSSLCryptoKeyDSA::OpenSSLCryptoKeyDSA() {
// Create a new key to be loaded as we go
@@ -331,4 +333,4 @@
}
-#endif /* HAVE_OPENSSL */
\ No newline at end of file
+#endif /* HAVE_OPENSSL */
1.17 +3 -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.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- OpenSSLCryptoKeyRSA.cpp 3 Feb 2005 13:13:08 -0000 1.16
+++ OpenSSLCryptoKeyRSA.cpp 19 Feb 2005 03:37:48 -0000 1.17
@@ -33,6 +33,8 @@
#include <xsec/enc/XSECCryptoException.hpp>
#include <xsec/framework/XSECError.hpp>
+#include <openssl/rsa.h>
+
#include <xercesc/util/Janitor.hpp>
XSEC_USING_XERCES(ArrayJanitor);
1.11 +5 -1 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.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- OpenSSLCryptoX509.cpp 3 Feb 2005 13:13:08 -0000 1.10
+++ OpenSSLCryptoX509.cpp 19 Feb 2005 03:37:48 -0000 1.11
@@ -142,7 +142,11 @@
bufLen += finalLen;
*/
if (bufLen > 0) {
+#if defined(XSEC_OPENSSL_D2IX509_CONST_BUFFER)
+ mp_X509= d2i_X509(NULL, (const unsigned char **) (&outBuf), bufLen);
+#else
mp_X509= d2i_X509(NULL, &outBuf, bufLen);
+#endif
}
// Check to see if we have a certificate....
1.13 +1 -1 xml-security/c/src/framework/XSECConfig.hpp.in
Index: XSECConfig.hpp.in
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECConfig.hpp.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- XSECConfig.hpp.in 3 Feb 2005 13:26:30 -0000 1.12
+++ XSECConfig.hpp.in 19 Feb 2005 03:37:48 -0000 1.13
@@ -100,7 +100,7 @@
#undef XSEC_OPENSSL_CONST_BUFFERS
#undef XSEC_OPENSSL_HAVE_AES
#undef XSEC_OPENSSL_CANSET_PADDING
-
+#undef XSEC_OPENSSL_D2IX509_CONST_BUFFER
/*
* Macros used to determine what header files exist on this
* system
1.14 +11 -2 xml-security/c/src/tools/checksig/InteropResolver.cpp
Index: InteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/checksig/InteropResolver.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- InteropResolver.cpp 3 Feb 2005 13:37:29 -0000 1.13
+++ InteropResolver.cpp 19 Feb 2005 03:37:48 -0000 1.14
@@ -556,7 +556,12 @@
x509bufLen += b64.decodeFinish(&x509buf[x509bufLen], (unsigned int) strlen(transb64cert) - x509bufLen);
if (x509bufLen > 0) {
+#if defined(XSEC_OPENSSL_D2IX509_CONST_BUFFER)
+ x = d2i_X509(NULL, (const unsigned char **) (&x509buf), x509bufLen
+);
+#else
x = d2i_X509(NULL, &x509buf, x509bufLen);
+#endif
}
else
return NULL; // Something has gone wrong
@@ -579,7 +584,11 @@
crlbufLen += b64.decodeFinish(&crlbuf[crlbufLen], (unsigned int) strlen(transb64crl) - crlbufLen);
if (crlbufLen > 0) {
- c = d2i_X509_CRL(NULL, &crlbuf, crlbufLen);
+#if defined(XSEC_OPENSSL_D2IX509_CONST_BUFFER)
+ c = d2i_X509_CRL(NULL, (const unsigned char **) (&crlbuf), crlbufLen);
+#else
+ c = d2i_X509_CRL(NULL, &crlbuf, crlbufLen);
+#endif
}
else
return NULL; // Something has gone wrong