blautenb 2004/03/13 19:50:24
Modified: c/src basicTests.pl
c/src/framework XSECW32Config.hpp
c/src/samples simpleDecrypt.cpp simpleEncrypt.cpp
simpleHMAC.cpp simpleValidate.cpp
c/src/tools/cipher XencInteropResolver.cpp cipher.cpp
Log:
Clean up build without xalan or openssl
Revision Changes Path
1.9 +9 -1 xml-security/c/src/basicTests.pl
Index: basicTests.pl
===================================================================
RCS file: /home/cvs/xml-security/c/src/basicTests.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- basicTests.pl 7 Mar 2004 03:20:08 -0000 1.8
+++ basicTests.pl 14 Mar 2004 03:50:24 -0000 1.9
@@ -57,6 +57,12 @@
my $checksig_vc7 = "../Build/Win32/VC7/Debug/checksig.exe";
my $cipher_vc7 = "../Build/Win32/VC7/Debug/cipher.exe";
+my $checksig_release = "../Build/Win32/VC6/Release/checksig.exe";
+my $cipher_release = "../Build/Win32/VC6/Release/cipher.exe";
+
+my $checksig_vc7release = "../Build/Win32/VC7/Release/checksig.exe";
+my $cipher_vc7release = "../Build/Win32/VC7/Release/cipher.exe";
+
if ($^O =~ m/Win/) {
$checksig = "../Build/Win32/VC6/Debug/checksig.exe";
$cipher = "../Build/Win32/VC6/Debug/cipher.exe";
@@ -248,7 +254,7 @@
sub print_args {
- print STDERR "\nUsage: basicTests.pl [--noxalan] [--nopothole] [--noaes]
[--vc7]\n\n";
+ print STDERR "\nUsage: basicTests.pl [--noxalan] [--nopothole] [--noaes]
[--vc7] [--vc7release] [--vc6release]\n\n";
exit(1);
}
@@ -262,6 +268,8 @@
if (/^--nopothole$/ || /^-p$/) {$have_pothole = 0; last SWITCH;}
if (/^--noaes$/ || /^-a$/) {$have_aes = 0; last SWITCH;}
if (/^--vc7$/) {$checksig = $checksig_vc7 ; $cipher = $cipher_vc7; last
SWITCH;}
+ if (/^--vc7release$/) {$checksig = $checksig_vc7release ; $cipher =
$cipher_vc7release; last SWITCH;}
+ if (/^--vc6release$/) {$checksig = $checksig_release ; $cipher =
$cipher_release; last SWITCH;}
if (/^--nosig$/) {$dosig = 0; last SWITCH;}
if (/^--noenc$/) {$doenc = 0; last SWITCH;}
print STDERR "Unknown command : " . $_ . "\n\n";
1.19 +2 -2 xml-security/c/src/framework/XSECW32Config.hpp
Index: XSECW32Config.hpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/framework/XSECW32Config.hpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XSECW32Config.hpp 7 Mar 2004 03:20:51 -0000 1.18
+++ XSECW32Config.hpp 14 Mar 2004 03:50:24 -0000 1.19
@@ -68,7 +68,7 @@
* Activate this #define if Xalan is not required (or desired)
*/
-#define XSEC_NO_XALAN
+/* #define XSEC_NO_XALAN */
/*
* Define presence of cryptographic providers
1.4 +2 -2 xml-security/c/src/samples/simpleDecrypt.cpp
Index: simpleDecrypt.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/simpleDecrypt.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- simpleDecrypt.cpp 9 Mar 2004 11:16:54 -0000 1.3
+++ simpleDecrypt.cpp 14 Mar 2004 03:50:24 -0000 1.4
@@ -126,7 +126,7 @@
// Create an input source
- MemBufInputSource* memIS = new MemBufInputSource ((const XMLByte*)
letter, strlen(letter), "XSECMem");
+ MemBufInputSource* memIS = new MemBufInputSource ((const XMLByte*)
letter, (unsigned int) strlen(letter), "XSECMem");
int errorCount = 0;
1.4 +2 -2 xml-security/c/src/samples/simpleEncrypt.cpp
Index: simpleEncrypt.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/simpleEncrypt.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- simpleEncrypt.cpp 9 Mar 2004 11:16:54 -0000 1.3
+++ simpleEncrypt.cpp 14 Mar 2004 03:50:24 -0000 1.4
@@ -180,7 +180,7 @@
/* First lets load the public key in the certificate */
OpenSSLCryptoX509 * x509 = new OpenSSLCryptoX509();
- x509->loadX509Base64Bin(cert, strlen(cert));
+ x509->loadX509Base64Bin(cert, (unsigned int) strlen(cert));
/* Now set the Key Encrypting Key (NOTE: Not the normal key) */
cipher->setKEK(x509->clonePublicKey());
1.7 +1 -1 xml-security/c/src/samples/simpleHMAC.cpp
Index: simpleHMAC.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/simpleHMAC.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- simpleHMAC.cpp 8 Feb 2004 10:24:38 -0000 1.6
+++ simpleHMAC.cpp 14 Mar 2004 03:50:24 -0000 1.7
@@ -140,7 +140,7 @@
// Set the HMAC Key to be the string "secret"
OpenSSLCryptoKeyHMAC * hmacKey = new OpenSSLCryptoKeyHMAC();
- hmacKey->setKey((unsigned char *) "secret", strlen("secret"));
+ hmacKey->setKey((unsigned char *) "secret", (unsigned int)
strlen("secret"));
sig->setSigningKey(hmacKey);
// Add a KeyInfo element
1.8 +2 -2 xml-security/c/src/samples/simpleValidate.cpp
Index: simpleValidate.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/samples/simpleValidate.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- simpleValidate.cpp 21 Feb 2004 08:26:53 -0000 1.7
+++ simpleValidate.cpp 14 Mar 2004 03:50:24 -0000 1.8
@@ -133,7 +133,7 @@
// Create an input source
- MemBufInputSource* memIS = new MemBufInputSource ((const XMLByte*)
docToValidate, strlen(docToValidate), "XSECMem");
+ MemBufInputSource* memIS = new MemBufInputSource ((const XMLByte*)
docToValidate, (unsigned int) strlen(docToValidate), "XSECMem");
int errorCount = 0;
@@ -176,7 +176,7 @@
// Use the OpenSSL interface objects to get a signing key
OpenSSLCryptoX509 * x509 = new OpenSSLCryptoX509();
- x509->loadX509Base64Bin(cert, strlen(cert));
+ x509->loadX509Base64Bin(cert, (unsigned int) strlen(cert));
sig->load();
DSIGKeyInfoList * kinfList = sig->getKeyInfoList();
1.7 +6 -4 xml-security/c/src/tools/cipher/XencInteropResolver.cpp
Index: XencInteropResolver.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/XencInteropResolver.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XencInteropResolver.cpp 9 Mar 2004 11:16:54 -0000 1.6
+++ XencInteropResolver.cpp 14 Mar 2004 03:50:24 -0000 1.7
@@ -298,6 +298,8 @@
}
+#if defined (HAVE_OPENSSL)
+
BIO * createFileBIO(const XMLCh * baseURI, const char * name) {
// Open file URI relative to the encrypted file
@@ -326,7 +328,7 @@
return bioFile;
}
-
+#endif
//
--------------------------------------------------------------------------------
// Resolver
//
--------------------------------------------------------------------------------
@@ -436,7 +438,7 @@
}
return k;
}
-
+#if defined (HAVE_OPENSSL)
if (strEquals(s_phaosRSAName, name)) {
// This is the Phaos RSA key
@@ -454,7 +456,7 @@
return k;
}
-
+#endif
// If we get this far, we don't know it. So look for
EncryptedKey elements
// containing this name as a CarriedKeyName
1.17 +2 -3 xml-security/c/src/tools/cipher/cipher.cpp
Index: cipher.cpp
===================================================================
RCS file: /home/cvs/xml-security/c/src/tools/cipher/cipher.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- cipher.cpp 9 Mar 2004 11:16:54 -0000 1.16
+++ cipher.cpp 14 Mar 2004 03:50:24 -0000 1.17
@@ -466,13 +466,12 @@
paramCount += 2;
} /* argv[1] = "--x509cert" */
+#endif /* HAVE_OPENSSL */
else {
printUsage();
return 2;
}
}
-
-#endif /* HAVE_OPENSSL */
else {
cerr << "Unknown option: " << argv[paramCount] << endl;
