Title: [836] trunk/jopenssl: - Bump version to 0.1
- Revision
- 836
- Author
- nicksieger
- Date
- 2007-12-13 14:30:48 -0500 (Thu, 13 Dec 2007)
Log Message
- Bump version to 0.1
- Found another couple System.getenv's to guard
Modified Paths
Diff
Modified: trunk/jopenssl/jruby-openssl.gemspec (835 => 836)
--- trunk/jopenssl/jruby-openssl.gemspec 2007-12-13 19:27:02 UTC (rev 835)
+++ trunk/jopenssl/jruby-openssl.gemspec 2007-12-13 19:30:48 UTC (rev 836)
@@ -2,7 +2,7 @@
spec = Gem::Specification.new do |s|
s.name = "jruby-openssl"
- s.version = "0.0.5"
+ s.version = "0.1"
s.author = "Ola Bini"
s.email = "[EMAIL PROTECTED]"
s.homepage = "http://jruby-extras.rubyforge.org/"
@@ -12,7 +12,6 @@
s.files = candidates.delete_if do |item| item.include?(".svn") || item.include?("rdoc") end
s.require_path = "lib"
s.has_rdoc = false
- s.requirements << "Java 1.5"
end
if $0 == __FILE__
Modified: trunk/jopenssl/src/java/org/jruby/ext/openssl/x509store/X509_LOOKUP.java (835 => 836)
--- trunk/jopenssl/src/java/org/jruby/ext/openssl/x509store/X509_LOOKUP.java 2007-12-13 19:27:02 UTC (rev 835)
+++ trunk/jopenssl/src/java/org/jruby/ext/openssl/x509store/X509_LOOKUP.java 2007-12-13 19:30:48 UTC (rev 836)
@@ -289,21 +289,24 @@
switch(cmd) {
case X509.X509_L_FILE_LOAD:
- if(argl == X509.X509_FILETYPE_DEFAULT) {
- file = System.getenv(X509.get_default_cert_file_env());
- if(file != null) {
- ok = ctx.load_cert_crl_file(file,X509.X509_FILETYPE_PEM) != 0 ? 1 : 0;
- } else {
- ok = (ctx.load_cert_crl_file(X509.get_default_cert_file(),X509.X509_FILETYPE_PEM) != 0) ? 1 : 0;
- }
- if(ok == 0) {
- Err.PUT_err(X509.X509_R_LOADING_DEFAULTS);
- }
+ if (argl == X509.X509_FILETYPE_DEFAULT) {
+ try {
+ file = System.getenv(X509.get_default_cert_file_env());
+ } catch (Error error) {
+ }
+ if (file != null) {
+ ok = ctx.load_cert_crl_file(file, X509.X509_FILETYPE_PEM) != 0 ? 1 : 0;
+ } else {
+ ok = (ctx.load_cert_crl_file(X509.get_default_cert_file(), X509.X509_FILETYPE_PEM) != 0) ? 1 : 0;
+ }
+ if (ok == 0) {
+ Err.PUT_err(X509.X509_R_LOADING_DEFAULTS);
+ }
} else {
- if(argl == X509.X509_FILETYPE_PEM) {
- ok = (ctx.load_cert_crl_file(argp,X509.X509_FILETYPE_PEM) != 0) ? 1 : 0;
+ if (argl == X509.X509_FILETYPE_PEM) {
+ ok = (ctx.load_cert_crl_file(argp, X509.X509_FILETYPE_PEM) != 0) ? 1 : 0;
} else {
- ok = (ctx.load_cert_file(argp,(int)argl) != 0) ? 1 : 0;
+ ok = (ctx.load_cert_file(argp, (int) argl) != 0) ? 1 : 0;
}
}
break;
@@ -353,7 +356,10 @@
switch(cmd) {
case X509.X509_L_ADD_DIR:
if(argl == X509.X509_FILETYPE_DEFAULT) {
- dir = System.getenv(X509.get_default_cert_dir_env());
+ try {
+ dir = System.getenv(X509.get_default_cert_dir_env());
+ } catch (Error error) {
+ }
if(null != dir) {
ret = add_cert_dir(ld,dir,X509.X509_FILETYPE_PEM);
} else {
_______________________________________________
Jruby-extras-devel mailing list
[email protected]
http://rubyforge.org/mailman/listinfo/jruby-extras-devel
