Merge pull request #5 from timlegge/bug-fix

Fix a couple of bugs in tests

Author: timlegge

t/06-test-encryption-methods.t

@@ -18,7 +18,7 @@ my @data_methods    = qw/aes128-cbc aes192-cbc aes256-cbc tripledes-cbc aes128-g
 my @oaep_mgf_algs   = qw/mgf1sha1 mgf1sha224 mgf1sha256 mgf1sha384 mgf1sha512/;
 
 my $xmlsec = get_xmlsec_features();
-my $lax_key_search = $xmlsec->{lax_key_search} ? '--lax_key_search': '';
+my $lax_key_search = $xmlsec->{lax_key_search} ? '--lax-key-search': '';
 
 foreach my $km (@key_methods) {
     foreach my $dm (@data_methods) {

t/08-support-oaepparams.t

@@ -1,11 +1,15 @@
 use strict;
 use warnings;
-use Test::More tests => 5;
+use Test::More tests => 7;
 use XML::Enc;
+use Test::Lib;
+use Test::XML::Enc;
 use MIME::Base64 qw/decode_base64/;
-use File::Which;
 use File::Slurper qw/read_text/;
 
+my $xmlsec = get_xmlsec_features();
+my $lax_key_search = $xmlsec->{lax_key_search} ? '--lax-key-search' :  '';
+
 my $xml = <<'ENDXML';
 <?xml version="1.0" encoding="UTF-8"?>
 <PaymentInfo xmlns="http://example.org/paymentv2">
@@ -75,6 +79,19 @@ ok($encrypted =~ /CipherData/, "Successfully Encrypted with XML::Enc using OAEPp
 
 ok($encrypter->decrypt($encrypted) =~ /<bar>123<\/bar>/, "Successfully Decrypted with XML::Enc using OAEPparams");
 
+SKIP: {
+    skip "xmlsec1 not installed", 2 unless $xmlsec->{installed};
+
+    ok( open ENCRYPTED, '>', 'encrypted.xml' );
+    print ENCRYPTED $encrypted;
+    close ENCRYPTED;
+
+    # Decrypt using xmlsec
+    my $encrypt_response = `xmlsec1 decrypt $lax_key_search --privkey-pem t/sign-private.pem encrypted.xml 2>&1`;
+    is($? >> 8, 0, "xmlsec1 decrypted oaep_params encrypted XML");
+    unlink 'encrypted.xml';
+}
+
 $decrypter = XML::Enc->new(
     {
         key                 => 't/sign-private.pem',

t/lib/Test/XML/Enc/Util.pm

@@ -51,7 +51,7 @@ sub get_xmlsec_features {
                     minor       => $minor,
                     patch       => $patch,
                     ripemd160   => ($major >= 1 and $minor >= 3) ? 1 : 0,
-                    aes_gcm     => ($major >= 1 and $minor >= 2 and $patch >= 27) ? 1 : 0,
+                    aes_gcm     => ($major <= 1 and $minor <= 2 and $patch <= 27) ? 0 : 1,
                     lax_key_search => ($major >= 1 and $minor >= 3) ? 1 : 0,
                 );
     return \%xmlsec;