diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | examples/0cert.pem | 38 | ||||
-rw-r--r-- | examples/0key.pem | 52 | ||||
-rwxr-xr-x | examples/gen_ca_cert.rb | 6 | ||||
-rw-r--r-- | ossl_cipher.c | 5 |
5 files changed, 58 insertions, 48 deletions
@@ -3,6 +3,9 @@ ChangeLog for ### CHANGE LOG ### +Sat, 8 Jun 2002 14:07:27 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz> + * cipher.c: Fix GetCipher - condition (!ciphp || !ciphp->cipher) was too tight + Sat, 8 Jun 2002 13:48:37 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz> * x509.h: dropped ossl_x509_get_X509(obj) * x509.h: introduced GetX509CertPtr(obj), DupX509CertPtr(obj) with the same semantics as explained for *PKeyPtr @@ -10,7 +13,7 @@ Sat, 8 Jun 2002 13:48:37 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz> * ssl.c: ditto. * x509ext.c: ditto. * x509store.c: ditto. - * x509ext.c: fix memory leaking after GC + * x509ext.c: fix memory leaking in ExtFactory after GC Sat, 8 Jun 2002 11:54:13 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz> * pkey.h: dropped ossl_pkey_get_EVP_PKEY, ossl_pkey_get_private_EVP_PKEY diff --git a/examples/0cert.pem b/examples/0cert.pem index cb383c7..9e2f89b 100644 --- a/examples/0cert.pem +++ b/examples/0cert.pem @@ -1,22 +1,22 @@ -----BEGIN CERTIFICATE----- -MIIDjzCCAnegAwIBAgIBADANBgkqhkiG9w0BAQUFADAtMQswCQYDVQQGEwJDWjEN -MAsGA1UEChMEUnVieTEPMA0GA1UEAxMGUnVieUNBMB4XDTAxMTEwODExNTkxMloX -DTAzMTEwODExNTkxMlowLTELMAkGA1UEBhMCQ1oxDTALBgNVBAoTBFJ1YnkxDzAN -BgNVBAMTBlJ1YnlDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOV8 -Vc1b83eGNdpfM4IFbEY8h+nx8XU9QMJ5EnWiOzSqrOZtG/R6rFP/jxDS+rDgh2FF -lzkdrRpElTVgCePEddrhSMj//8IprCN79sykiTILNAi0Wq9YHUCzADX+ViC0hkyS -rUs4kD7qr3psfp1imARD2IE2gVhs5+fuyZlNGg1xXjsEfRMX6Uf57q7NBh3edjWh -EfyKku7l51Z6X1r8tVPguyeeoZsnOPpQGKutchEskBwHjGwu0xBj9NJFKrIr9GBT -IsKL4iTG31ReZnLQrtUHlCmOQnfId3HBk+zzD3Z8db47KaUgaEFpyitl9l+1HzyU -3CjJzRmJZrYXycE3eYUCAwEAAaOBuTCBtjAPBgNVHRMECDAGAQH/AgEAMC0GCWCG +MIIDjzCCAnegAwIBAgIBADANBgkqhkiG9w0BAQUFADAtMQ8wDQYDVQQDEwZSdWJ5 +Q0ExCzAJBgNVBAYTAkNaMQ0wCwYDVQQKEwRSdWJ5MB4XDTAyMDYwODEyMDU1NFoX +DTA0MDYwNzEyMDU1NFowLTEPMA0GA1UEAxMGUnVieUNBMQswCQYDVQQGEwJDWjEN +MAsGA1UEChMEUnVieTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALSV +myZ3vSi1rbWecUBVwoImRmFJDDT6wTY/8hkbqNGEm5Wa/nvjCcg9b39/qCtUgz7m +hu6LUicZgoFK2g4UAaeQPvXuYjSM4V3hWrURt8GUKsRaqkU92+yFAXybN3A8O8Ed +7b8U75VEBT4296+4DIhNUo7WY1kYWnIAf7p89dhynzhkGH6L/m17Hn9xUb362vf3 +J6RWbH10+00D7LP0RIKM1GTm5biL+V3YG0cG0ax/7dyu/7bn0oukj0RJGHqLOcjt +a8+Qhdj7HBvMSwR6DZNCyBxpRFm/scTLgEsMvwkK8pGFKhZ/E0hCbp4w8qpPY9cv +t56lkCk4f406SMOxtV0CAwEAAaOBuTCBtjAPBgNVHRMECDAGAQH/AgEAMC0GCWCG SAGG+EIBDQQgFh5HZW5lcmF0ZWQgYnkgT3BlblNTTCBmb3IgUnVieS4wHQYDVR0O -BBYEFFhFcoVGe0cAv4c8QexFYb1YqCtoMFUGA1UdIwROMEyAFFhFcoVGe0cAv4c8 -QexFYb1YqCtooTGkLzAtMQswCQYDVQQGEwJDWjENMAsGA1UEChMEUnVieTEPMA0G -A1UEAxMGUnVieUNBggEAMA0GCSqGSIb3DQEBBQUAA4IBAQDQhltRNlB8KyhgyXNZ -qYTupPvsoj1NDbXQT1nyNirOjGSqRYxcOshL2vfhgIESs5jQdcR+B41Oj3N+MEkI -rPyXIcbI1MSjB/W0pHVDpxf/++cZ7OXUhhF0f25+ZO9qnWl4mdKH3XNWJM4lnzGn -Q8UDs9aJr8FBh8puo4u27I844K6GoIWyAzAwyyDmoaCRpkt5YSJua07OVsVTUdpj -5z9rNOjmymuA82VpKvzsxFev7z4UragXRBX92OCRIzIE5Ne8zGLFTjKGt5us7D79 -bYqjOv2ax0bOj8UgTw0Fyl5mKao00uTz4nZyjhxuE7qUeaFNnoFbzQL6isZRBsST -1eph +BBYEFOwz7N8WJ3wEitrT7P7iv1nlAD21MFUGA1UdIwROMEyAFOwz7N8WJ3wEitrT +7P7iv1nlAD21oTGkLzAtMQ8wDQYDVQQDEwZSdWJ5Q0ExCzAJBgNVBAYTAkNaMQ0w +CwYDVQQKEwRSdWJ5ggEAMA0GCSqGSIb3DQEBBQUAA4IBAQA3F4AS+tjDw08kHb1U +ukLrc+krNmoKIEt5DUCeS/SX9YAU3E4/Q/A/d9ODqVrufO2J+Ecb5iNSRPO6iahW +SCSKsNw/c7BDV+rHmxXsyL53Re9rq5M5tuo069Ivpz553UpuwjtDl+TeOkLYzlO9 +c5nOodqc+CPYCAWFPjJgv9hjLg4F3I2MYgxysmcq2RZenUA2K3IENIUx1NvjgB38 +Dl/DtXVOGB9EjSQmTkkfT6WMrxdqMPOl14vmWpzREA/7oW3+uQ6vn5fibjDNnYcj +TgKryZlUTtN6cHbVP4HHlVS0N3m0Qa4+c+dPmJne4TM7cc9fA1P6EwSlb7fCjNmq +aFzT -----END CERTIFICATE----- diff --git a/examples/0key.pem b/examples/0key.pem index 0ef2deb..90fa62e 100644 --- a/examples/0key.pem +++ b/examples/0key.pem @@ -1,30 +1,30 @@ -----BEGIN RSA PRIVATE KEY----- Proc-Type: 4,ENCRYPTED -DEK-Info: DES-EDE3-CBC,26F5AE5B49B3A1FF +DEK-Info: DES-EDE3-CBC,14392D9C8242FF89 -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 -----END RSA PRIVATE KEY----- diff --git a/examples/gen_ca_cert.rb b/examples/gen_ca_cert.rb index 798a323..6dd0632 100755 --- a/examples/gen_ca_cert.rb +++ b/examples/gen_ca_cert.rb @@ -5,6 +5,10 @@ include OpenSSL include X509 include PKey +p RUBY_VERSION +p OpenSSL::VERSION +p OPENSSL_VERSION + p key = RSA.new(2048) p new = Certificate.new name = [['C', 'CZ'],['O','Ruby'],['CN','RubyCA']] @@ -34,6 +38,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/ossl_cipher.c b/ossl_cipher.c index 181d657..8c3fe92 100644 --- a/ossl_cipher.c +++ b/ossl_cipher.c @@ -13,13 +13,16 @@ #define MakeCipher(obj, klass, ciphp) obj = Data_Make_Struct(klass, ossl_cipher, 0, ossl_cipher_free, ciphp) #define GetCipher(obj, ciphp) do { \ Data_Get_Struct(obj, ossl_cipher, ciphp); \ - if (!ciphp || !ciphp->cipher) { \ + if (!ciphp) { \ rb_raise(rb_eRuntimeError, "Cipher not inititalized!"); \ } \ } while (0) #define SafeGetCipher(obj, ciphp) do { \ OSSL_Check_Kind(obj, cCipher); \ GetCipher(obj, ciphp); \ + if (!ciphp->cipher) { \ + rb_raise(rb_eRuntimeError, "Cipher not inititalized!"); \ + } \ } while (0) /* |