summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Rokos <m.rokos@sh.cvut.cz>2003-06-03 13:48:23 +0000
committerMichal Rokos <m.rokos@sh.cvut.cz>2003-06-03 13:48:23 +0000
commit63e77ab5f40c68c09a1b894a2cb8144b3117cb56 (patch)
tree18ffd5e2623aa004bab13a09e8d660938a16c320
parentd0fba858ef108a45c3ae737f02210ceae14ed031 (diff)
downloadruby-openssl-history-63e77ab5f40c68c09a1b894a2cb8144b3117cb56.tar.gz
Fixes from NaHi and Stef Telford
-rw-r--r--ChangeLog6
-rwxr-xr-xexamples/gen_cert.rb4
-rwxr-xr-xexamples/ssl/svr.rb4
3 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f778693..ed383b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue, 03 Jun 2003 15:46:01 +0200 -- Michal Rokos <michal@rokos.homeip.net>
+ * examples/ssl/svr.rb: CTX fixes by Stef Telford <stef@chronozon.artofdns.com> (Thanks!)
+
+Mon, 02 Jun 2003 21:41:38 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz>
+ * examples/gen_cert.rb: fixes by NaHi
+
Mon, 02 Jun 2003 09:40:13 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz>
* ossl.c: remove strptime (caused problems on Cygwin/Linux boxes). Done by NaHi <nahi@keynauts.com> (Thanks!)
diff --git a/examples/gen_cert.rb b/examples/gen_cert.rb
index 27bd2af..f1501c1 100755
--- a/examples/gen_cert.rb
+++ b/examples/gen_cert.rb
@@ -12,7 +12,7 @@ p key = RSA.new(1024)
p new = Certificate.new
name = [['C', 'CZ'],['O','Ruby'],['CN','RA Officer']]
p new.subject = Name.new(name)
-p new.issuer = Name.new(name)
+p new.issuer = ca.subject
p new.not_before = Time.now
p new.not_after = Time.now + (365*24*60*60)
p new.public_key = key
@@ -36,6 +36,6 @@ puts "Enter Password:"
p pass = gets.chop!
f = File.new("./#{new.serial}key.pem", "w")
-f.write key.export(Cipher::DES.new(Cipher::EDE3, Cipher::CBC), pass)
+f.write key.export(Cipher::DES.new(:EDE3, :CBC), pass)
f.close
diff --git a/examples/ssl/svr.rb b/examples/ssl/svr.rb
index ddc85b6..2c30adb 100755
--- a/examples/ssl/svr.rb
+++ b/examples/ssl/svr.rb
@@ -28,9 +28,9 @@ if verify_peer
if ca_cert.nil?
# no nothing
elsif FileTest::file?(ca_cert)
- ssl.ca_file = ca_cert
+ ctx.ca_file = ca_cert
elsif FileTest::directory?(ce_cert)
- ssl.ca_path = ca_cert
+ ctx.ca_path = ca_cert
end
end
STDERR.print "SSLContext: #{ctx.inspect}.\n"