* ext/openssl/ossl_ocsp.c (ossl_ocspcid_initialize): an optional

  parameter may be used to specify the OpenSSL::OCSP::CertificateId on
  initialization.  Thanks Elise Huard! [ruby-core:32460]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29699 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 22 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index df4c81a2df..7c0d26b67a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov  6 00:43:58 2010  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/openssl/ossl_ocsp.c (ossl_ocspcid_initialize): an optional
+	  parameter may be used to specify the OpenSSL::OCSP::CertificateId on
+	  initialization.  Thanks Elise Huard! [ruby-core:32460]
+
 Fri Nov  5 12:23:01 2010  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* test/ruby/test_{process,system}.rb (test_fallback_to_sh):
diff --git a/ext/openssl/ossl_ocsp.c b/ext/openssl/ossl_ocsp.c
index 1c53147a03..fb01243261 100644
--- a/ext/openssl/ossl_ocsp.c
+++ b/ext/openssl/ossl_ocsp.c
@@ -628,14 +628,27 @@ ossl_ocspcid_alloc(VALUE klass)
 }
 
 static VALUE
-ossl_ocspcid_initialize(VALUE self, VALUE subject, VALUE issuer)
+ossl_ocspcid_initialize(int argc, VALUE *argv, VALUE self)
 {
     OCSP_CERTID *id, *newid;
     X509 *x509s, *x509i;
+    VALUE subject, issuer, digest;
+    const EVP_MD *md;
+
+    if (rb_scan_args(argc, argv, "21", &subject, &issuer, &digest) == 0) {
+	return self;
+    }
 
     x509s = GetX509CertPtr(subject); /* NO NEED TO DUP */
     x509i = GetX509CertPtr(issuer); /* NO NEED TO DUP */
-    if(!(newid = OCSP_cert_to_id(NULL, x509s, x509i)))
+
+    if (!NIL_P(digest)) {
+	md = GetDigestPtr(digest);
+	newid = OCSP_cert_to_id(md, x509s, x509i);
+    } else {
+	newid = OCSP_cert_to_id(NULL, x509s, x509i);
+    }
+    if(!newid)
 	ossl_raise(eOCSPError, NULL);
     GetOCSPCertId(self, id);
     OCSP_CERTID_free(id);
@@ -719,7 +732,7 @@ Init_ossl_ocsp()
 
     cOCSPCertId = rb_define_class_under(mOCSP, "CertificateId", rb_cObject);
     rb_define_alloc_func(cOCSPCertId, ossl_ocspcid_alloc);
-    rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, 2);
+    rb_define_method(cOCSPCertId, "initialize", ossl_ocspcid_initialize, -1);
     rb_define_method(cOCSPCertId, "cmp", ossl_ocspcid_cmp, 1);
     rb_define_method(cOCSPCertId, "cmp_issuer", ossl_ocspcid_cmp_issuer, 1);
     rb_define_method(cOCSPCertId, "serial", ossl_ocspcid_get_serial, 0);