Diff
Modified: trunk/jopenssl/jruby-openssl.gemspec (521 => 522)
--- trunk/jopenssl/jruby-openssl.gemspec 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/jruby-openssl.gemspec 2007-04-30 13:09:10 UTC (rev 522)
@@ -2,7 +2,7 @@
spec = Gem::Specification.new do |s|
s.name = "jruby-openssl"
- s.version = "0.0.1"
+ s.version = "0.0.2"
s.author = "Ola Bini"
s.email = "[EMAIL PROTECTED]"
s.homepage = "http://jruby-extras.rubyforge.org/"
Modified: trunk/jopenssl/lib/jopenssl.jar
(Binary files differ)
Modified: trunk/jopenssl/lib/jruby.jar
(Binary files differ)
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/ASN1.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/ASN1.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/ASN1.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -595,7 +595,7 @@
}
public IRubyObject initialize(IRubyObject[] args, Block unusedBlock) {
- checkArgumentCount(args,3,3);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(), args,3,3);
IRubyObject value = args[0];
IRubyObject tag = args[1];
IRubyObject tag_class = args[2];
@@ -687,7 +687,7 @@
}
public IRubyObject initialize(IRubyObject[] args, Block unusedBlock) {
- checkArgumentCount(args,1,4);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(), args,1,4);
IRubyObject value = args[0];
IRubyObject tag = getRuntime().getNil();
IRubyObject tagging = getRuntime().getNil();
@@ -809,7 +809,7 @@
}
public IRubyObject initialize(IRubyObject[] args, Block unusedBlock) {
- checkArgumentCount(args,1,4);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,4);
IRubyObject value = args[0];
IRubyObject tag = getRuntime().getNil();
IRubyObject tagging = getRuntime().getNil();
@@ -876,7 +876,7 @@
public IRubyObject each(Block block) {
RubyArray arr = (RubyArray)callMethod(getRuntime().getCurrentContext(),"value");
for(Iterator iter = arr.getList().iterator();iter.hasNext();) {
- getRuntime().getCurrentContext().yield((IRubyObject)iter.next(), block);
+ block.yield(getRuntime().getCurrentContext(),(IRubyObject)iter.next());
}
return getRuntime().getNil();
}
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/Attribute.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/Attribute.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/Attribute.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -97,7 +97,7 @@
}
public IRubyObject _initialize(IRubyObject[] str, Block unusedBlock) throws Exception {
- if(checkArgumentCount(str,1,2) == 1) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),str,1,2) == 1) {
IRubyObject _oid = OpenSSLImpl.to_der_if_possible(str[0]);
set_oid(_oid);
return this;
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/Cipher.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/Cipher.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/Cipher.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -333,7 +333,7 @@
public IRubyObject encrypt(IRubyObject[] args) {
//TODO: implement backwards compat
- checkArgumentCount(args,0,2);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2);
encryptMode = true;
//modeParams = args;
ciphInited = false;
@@ -342,7 +342,7 @@
public IRubyObject decrypt(IRubyObject[] args) {
//TODO: implement backwards compat
- checkArgumentCount(args,0,2);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2);
encryptMode = false;
//modeParams = args;
ciphInited = false;
@@ -363,7 +363,7 @@
}
public IRubyObject pkcs5_keyivgen(IRubyObject[] args) {
- checkArgumentCount(args,1,4);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,4);
byte[] pass = args[0].convertToString().getBytes();
byte[] salt = null;
int iter = 2048;
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/Digest.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/Digest.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/Digest.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -130,7 +130,7 @@
public IRubyObject initialize(IRubyObject[] args, Block unusedBlock) {
IRubyObject type;
IRubyObject data = ""
- if(checkArgumentCount(args,1,2) == 2) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 2) {
data = ""
}
type = args[0];
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/OpenSSLReal.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/OpenSSLReal.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/OpenSSLReal.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -38,7 +38,7 @@
public static void createOpenSSL(Ruby runtime) {
java.security.Security.insertProviderAt(new org.bouncycastle.jce.provider.BouncyCastleProvider(),2);
- RubyModule ossl = runtime.defineModule("OpenSSL");
+ RubyModule ossl = runtime.getOrCreateModule("OpenSSL");
RubyClass standardError = runtime.getClass("StandardError");
ossl.defineClassUnder("OpenSSLError",standardError,standardError.getAllocator());
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/PKCS7.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/PKCS7.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/PKCS7.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -140,7 +140,7 @@
IRubyObject data = ""
IRubyObject certs = recv.getRuntime().getNil();
//IRubyObject flags = recv.getRuntime().getNil();
- recv.checkArgumentCount(args,3,5);
+ org.jruby.runtime.Arity.checkArgumentCount(recv.getRuntime(),args,3,5);
switch(args.length) {
case 5:
//flags = args[4];
@@ -192,7 +192,7 @@
private CMSSignedData signedData;
public IRubyObject _initialize(IRubyObject[] args, Block unusedBlock) throws Exception {
- if(checkArgumentCount(args,0,1) == 0) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,1) == 0) {
return this;
}
IRubyObject arg = OpenSSLImpl.to_der_if_possible(args[0]);
@@ -306,7 +306,7 @@
//IRubyObject store;
IRubyObject indata = getRuntime().getNil();
//IRubyObject flags = getRuntime().getNil();
- switch(checkArgumentCount(args,2,4)) {
+ switch(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,2,4)) {
case 4:
//flags = args[3];
case 3:
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/PKeyDSA.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/PKeyDSA.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/PKeyDSA.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -109,7 +109,7 @@
IRubyObject arg;
IRubyObject pass = null;
char[] passwd = null;
- if(checkArgumentCount(args,0,2) == 0) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2) == 0) {
} else {
arg = args[0];
if(args.length > 1) {
@@ -224,7 +224,7 @@
public IRubyObject export(IRubyObject[] args) throws Exception {
StringWriter w = new StringWriter();
- checkArgumentCount(args,0,2);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2);
char[] passwd = null;
String algo = null;
if(args.length > 0 && !args[0].isNil()) {
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/PKeyRSA.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/PKeyRSA.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/PKeyRSA.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -122,7 +122,7 @@
IRubyObject arg;
IRubyObject pass = null;
char[] passwd = null;
- if(checkArgumentCount(args,0,2) == 0) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2) == 0) {
} else {
arg = args[0];
if(args.length > 1) {
@@ -290,7 +290,7 @@
public IRubyObject export(IRubyObject[] args) throws Exception {
StringWriter w = new StringWriter();
- checkArgumentCount(args,0,2);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2);
char[] passwd = null;
String algo = null;
if(args.length > 0 && !args[0].isNil()) {
@@ -326,7 +326,7 @@
public IRubyObject private_encrypt(IRubyObject[] args) throws Exception {
int padding = 1;
- if(checkArgumentCount(args,1,2) == 2 && !args[1].isNil()) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 2 && !args[1].isNil()) {
padding = RubyNumeric.fix2int(args[1]);
}
String p = getPadding(padding);
@@ -344,7 +344,7 @@
public IRubyObject private_decrypt(IRubyObject[] args) throws Exception {
int padding = 1;
- if(checkArgumentCount(args,1,2) == 2 && !args[1].isNil()) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 2 && !args[1].isNil()) {
padding = RubyNumeric.fix2int(args[1]);
}
String p = getPadding(padding);
@@ -362,7 +362,7 @@
public IRubyObject public_encrypt(IRubyObject[] args) throws Exception {
int padding = 1;
- if(checkArgumentCount(args,1,2) == 2 && !args[1].isNil()) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 2 && !args[1].isNil()) {
padding = RubyNumeric.fix2int(args[1]);
}
String p = getPadding(padding);
@@ -376,7 +376,7 @@
public IRubyObject public_decrypt(IRubyObject[] args) throws Exception {
int padding = 1;
- if(checkArgumentCount(args,1,2) == 2 && !args[1].isNil()) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 2 && !args[1].isNil()) {
padding = RubyNumeric.fix2int(args[1]);
}
String p = getPadding(padding);
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/Request.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/Request.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/Request.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -105,7 +105,7 @@
}
public IRubyObject _initialize(IRubyObject[] args, Block block) throws Exception {
- if(checkArgumentCount(args,0,1) == 0) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,1) == 0) {
return this;
}
req = new PKCS10CertificationRequestExt(args[0].convertToString().getBytes());
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/SSLSocket.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -114,7 +114,7 @@
public IRubyObject _initialize(IRubyObject[] args, Block unusedBlock) throws Exception {
IRubyObject io, ctx;
ThreadContext tc = getRuntime().getCurrentContext();
- if(checkArgumentCount(args,1,2) == 1) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 1) {
ctx = ((RubyModule)(getRuntime().getModule("OpenSSL").getConstant("SSL"))).getClass("SSLContext").callMethod(tc,"new");
} else {
ctx = args[1];
@@ -373,7 +373,7 @@
public IRubyObject sysread(IRubyObject[] args) throws Exception {
// System.err.println("WARNING: unimplemented method called: SSLSocket#sysread");
- checkArgumentCount(args,1,2);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2);
int len = RubyNumeric.fix2int(args[0]);
IRubyObject str = args.length == 2 ? args[1] : getRuntime().newString("");
if(len == 0) {
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509CRL.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509CRL.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509CRL.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -136,7 +136,7 @@
public IRubyObject _initialize(IRubyObject[] args, Block block) throws Exception {
// System.err.println("WARNING: unimplemented method called: CRL#initialize");
extensions = new ArrayList();
- if(checkArgumentCount(args,0,1) == 0) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,1) == 0) {
version = getRuntime().getNil();
issuer = getRuntime().getNil();
last_update = getRuntime().getNil();
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Cert.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Cert.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Cert.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -148,7 +148,7 @@
public IRubyObject _initialize(IRubyObject[] args, Block unusedBlock) throws Exception {
extensions = new ArrayList();
- if(checkArgumentCount(args,0,1) == 0) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,1) == 0) {
return this;
}
ThreadContext tc = getRuntime().getCurrentContext();
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Extensions.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Extensions.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Extensions.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -107,7 +107,7 @@
}
public IRubyObject initialize(IRubyObject[] args, Block unusedBlock) {
- checkArgumentCount(args,0,4);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,4);
if(args.length > 0 && !args[0].isNil()) {
set_issuer_cert(args[0]);
}
@@ -163,7 +163,7 @@
public IRubyObject create_ext(IRubyObject[] args) throws Exception {
IRubyObject critical = getRuntime().getFalse();
- if(checkArgumentCount(args,2,3) == 3 && !args[2].isNil()) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,2,3) == 3 && !args[2].isNil()) {
critical = args[2];
}
String oid = args[0].toString();
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Name.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Name.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Name.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -129,7 +129,7 @@
}
public IRubyObject initialize(IRubyObject[] args, Block unusedBlock) {
- if(checkArgumentCount(args,0,2) == 0) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,0,2) == 0) {
return this;
}
IRubyObject arg = args[0];
@@ -226,7 +226,7 @@
}
public IRubyObject add_entry(IRubyObject[] args) {
- checkArgumentCount(args,2,3);
+ org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,2,3);
String oid = args[0].toString();
String value = args[1].toString();
IRubyObject type = ((RubyModule)(getRuntime().getModule("OpenSSL").getConstant("X509"))).getClass("Name").getConstant("OBJECT_TYPE_TEMPLATE").callMethod(getRuntime().getCurrentContext(),"[]",args[0]);
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Store.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Store.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509Store.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -171,7 +171,7 @@
public IRubyObject verify(IRubyObject[] args, Block block) throws Exception {
IRubyObject cert, chain;
- if(checkArgumentCount(args,1,2) == 2) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,2) == 2) {
chain = args[1];
} else {
chain = getRuntime().getNil();
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/X509StoreCtx.java (521 => 522)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/X509StoreCtx.java 2007-04-30 10:46:18 UTC (rev 521)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/X509StoreCtx.java 2007-04-30 13:09:10 UTC (rev 522)
@@ -99,7 +99,7 @@
X509AuxCertificate x509 = null;
List x509s = new ArrayList();
- if(checkArgumentCount(args,1,3) > 1) {
+ if(org.jruby.runtime.Arity.checkArgumentCount(getRuntime(),args,1,3) > 1) {
cert = args[1];
}
if(args.length > 2) {
