Diff
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/impl/PKCS7.java (1106 => 1107)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/impl/PKCS7.java 2008-08-12 14:01:11 UTC (rev 1106)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/impl/PKCS7.java 2008-08-12 14:01:14 UTC (rev 1107)
@@ -274,7 +274,6 @@
throw new PKCS7Exception(F_PKCS7_SIGNATUREVERIFY, R_UNABLE_TO_FIND_MESSAGE_DIGEST);
}
if(!Arrays.equals(md_dat, message_digest.getOctets())) {
- System.err.println("Internal digest bad");
throw new NotVerifiedPKCS7Exception();
}
@@ -290,9 +289,10 @@
sign.update(currentData);
}
if(!sign.verify(os.getOctets())) {
- System.err.println("verify returned false");
throw new NotVerifiedPKCS7Exception();
}
+ } catch(NotVerifiedPKCS7Exception e) {
+ throw e;
} catch(Exception e) {
System.err.println("Other exception");
e.printStackTrace();
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/impl/PKCS7DataData.java (1106 => 1107)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/impl/PKCS7DataData.java 2008-08-12 14:01:11 UTC (rev 1106)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/impl/PKCS7DataData.java 2008-08-12 14:01:14 UTC (rev 1107)
@@ -80,6 +80,9 @@
}
public ASN1Encodable asASN1() {
+ if(data == null) {
+ return new DEROctetString(new byte[0]).toASN1Object();
+ }
return data.toASN1Object();
}
}// PKCS7DataData
Modified: trunk/jopenssl/test/test_java.rb (1106 => 1107)
--- trunk/jopenssl/test/test_java.rb 2008-08-12 14:01:11 UTC (rev 1106)
+++ trunk/jopenssl/test/test_java.rb 2008-08-12 14:01:14 UTC (rev 1107)
@@ -34,6 +34,7 @@
SignerInfoWithPkey = org.jruby.ext.openssl.impl.SignerInfoWithPkey unless defined?(SignerInfoWithPkey)
IssuerAndSerialNumber = org.bouncycastle.asn1.pkcs.IssuerAndSerialNumber unless defined?(IssuerAndSerialNumber)
ASN1InputStream = org.bouncycastle.asn1.ASN1InputStream unless defined?(ASN1InputStream)
+ X509AuxCertificate = org.jruby.ext.openssl.x509store.X509AuxCertificate unless defined?(X509AuxCertificate)
ArrayList = java.util.ArrayList unless defined?(ArrayList)
CertificateFactory = java.security.cert.CertificateFactory unless defined?(CertificateFactory)
@@ -85,7 +86,7 @@
-----END X509 CRL-----
CRL
- X509Cert = CertificateFactory.getInstance("X.509",BCP.new).generateCertificate(ByteArrayInputStream.new(X509CertString.to_java_bytes))
+ X509Cert = X509AuxCertificate.new(CertificateFactory.getInstance("X.509",BCP.new).generateCertificate(ByteArrayInputStream.new(X509CertString.to_java_bytes)))
X509CRL = CertificateFactory.getInstance("X.509",BCP.new).generateCRL(ByteArrayInputStream.new(X509CRLString.to_java_bytes))
end
Modified: trunk/jopenssl/test/test_java_pkcs7.rb (1106 => 1107)
--- trunk/jopenssl/test/test_java_pkcs7.rb 2008-08-12 14:01:11 UTC (rev 1106)
+++ trunk/jopenssl/test/test_java_pkcs7.rb 2008-08-12 14:01:14 UTC (rev 1107)
@@ -80,7 +80,7 @@
p7.detached = 2
assert_equal 1, p7.get_detached
- assert_equal nil, test_p7.data
+ assert_equal nil, test_p7.get_data
end
def test_set_not_detached
@@ -98,7 +98,7 @@
p7.detached = 0
assert_equal 0, p7.get_detached
- assert_equal data, test_p7.data
+ assert_equal data, test_p7.get_data
end
def test_is_detached
@@ -162,7 +162,7 @@
p7.type = ASN1Registry::NID_pkcs7_data
assert p7.data?
- assert_equal ASN1::OctetString.new("".to_java_bytes), p7.data
+ assert_equal ASN1::OctetString.new("".to_java_bytes), p7.get_data
assert_nil p7.get_sign
assert_nil p7.get_enveloped
Modified: trunk/jopenssl/test/test_openssl.rb (1106 => 1107)
--- trunk/jopenssl/test/test_openssl.rb 2008-08-12 14:01:11 UTC (rev 1106)
+++ trunk/jopenssl/test/test_openssl.rb 2008-08-12 14:01:14 UTC (rev 1107)
@@ -19,7 +19,7 @@
protect_require 'openssl/test_hmac'
protect_require 'openssl/test_ns_spki'
protect_require 'openssl/test_pair'
-#protect_require 'openssl/test_pkcs7'
+protect_require 'openssl/test_pkcs7'
protect_require 'openssl/test_pkey_rsa'
protect_require 'openssl/test_ssl'
protect_require 'openssl/test_x509cert'
