diff options
author | Michal Rokos <m.rokos@sh.cvut.cz> | 2003-07-22 09:04:49 +0000 |
---|---|---|
committer | Michal Rokos <m.rokos@sh.cvut.cz> | 2003-07-22 09:04:49 +0000 |
commit | af81e3e12742809d14867321ecb55349226f9663 (patch) | |
tree | 076527c0912b2a0e224d74eeace8509b6547f90d | |
parent | fc145835428ffce934bcdd4b9667bdb7c0b6fcb9 (diff) | |
download | ruby-openssl-history-af81e3e12742809d14867321ecb55349226f9663.tar.gz |
Remove not-used coreossl-grafted-ruby-import-point
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | ossl_pkey_rsa.c | 69 | ||||
-rw-r--r-- | ossl_x509name.c | 21 |
3 files changed, 5 insertions, 89 deletions
@@ -1,3 +1,7 @@ +Tue, 22 Jul 2003 11:05:00 +0200 -- Michal Rokos <m.rokos@sh.cvut.cz> + * ossl_pkey_rsa.c: Remove not-used code + * ossl_x509name.c: ditto. + Tue, 22 Jul 2003 17:32:54 +0900 -- GOTOU Yuuzou <gotoyuzo@notwork.org> * ossl_pkcs7.c: get rid of unused function: ossl_pkcs7_data_verify(), ossl_pkcs7_data_decode() diff --git a/ossl_pkey_rsa.c b/ossl_pkey_rsa.c index e8c74f0..c3d2366 100644 --- a/ossl_pkey_rsa.c +++ b/ossl_pkey_rsa.c @@ -423,67 +423,6 @@ ossl_rsa_to_public_key(VALUE self) return obj; } -#if 0 -/* - * TODO, FIXME - * Find some good way how to specify type - * Is NID_md5_sha1 OK for all? (Don't think so.) - */ -static VALUE -ossl_rsa_sign(VALUE self, VALUE data) -{ - EVP_PKEY *pkey; - char *m, *buf; - int m_len, buf_len; - int type = 0; - VALUE str; - - if (0 && rb_obj_is_kind_of(self, cDigest)) { - } else { - StringValue(data); - m = RSTRING(data)->ptr; - m_len = RSTRING(data)->len; - } - - GetPKeyRSA(self, pkey); - if (!RSA_PRIVATE(pkey->pkey.rsa)) { - ossl_raise(eRSAError, "Private RSA key needed!"); - } - if (!(buf = OPENSSL_malloc(RSA_size(pkey->pkey.rsa) + 16))) { - ossl_raise(eRSAError, NULL); - } - if (!RSA_sign(type, m, m_len, buf, &buf_len, pkey->pkey.rsa)) { - OPENSSL_free(buf); - ossl_raise(eRSAError, NULL); - } - str = rb_str_new(buf, buf_len); - OPENSSL_free(buf); - - return str; -} - -static VALUE -ossl_rsa_verify(VALUE self, VALUE sig, VALUE data) -{ - EVP_PKEY *pkey; - int ret; - - GetPKeyDSA(self, pkey); - StringValue(digest); - StringValue(sig); - ret = RSA_verify(0, RSTRING(digest)->ptr, RSTRING(digest)->len, - RSTRING(sig)->ptr, RSTRING(sig)->len, pkey->pkey.rsa); - if (ret < 0) { - ossl_raise(eRSAError, NULL); - } - else if (ret == 1) { - return Qtrue; - } - - return Qfalse; -} -#endif - /* * TODO: Test me extern BN_CTX *ossl_bn_ctx; @@ -559,13 +498,6 @@ Init_ossl_rsa() rb_define_method(cRSA, "params", ossl_rsa_get_params, 0); /* - * TODO, FIXME - * Find way how to support digest types - * - rb_define_method(cRSA, "syssign", ossl_rsa_sign, 2); - rb_define_method(cRSA, "sysverify", ossl_rsa_verify, 3); - */ -/* * TODO: Test it rb_define_method(cRSA, "blinding_on!", ossl_rsa_blinding_on, 0); rb_define_method(cRSA, "blinding_off!", ossl_rsa_blinding_off, 0); @@ -580,3 +512,4 @@ Init_ossl_rsa() rb_warning("OpenSSL is compiled without RSA support"); } #endif /* NO_RSA */ + diff --git a/ossl_x509name.c b/ossl_x509name.c index 6be3253..a1e5cba 100644 --- a/ossl_x509name.c +++ b/ossl_x509name.c @@ -163,27 +163,6 @@ ossl_x509name_to_a(VALUE self) return ary; } -#if 0 -static VALUE -ossl_x509name_digest(VALUE self, VALUE digest) -{ - X509_NAME *name; - const EVP_MD *md; - VALUE str; - - GetX509Name(self, name); - md = GetDigestPtr(digest); - /* ALLOC! */ - if (!X509_NAME_digest(name, md, buf, &buf_len)) { - ossl_raise(eX509NameError, NULL); - } - str = rb_str_new(buf, buf_len); - OPENSSL_free(buf); - - return str; -} -#endif - static int ossl_x509name_cmp0(VALUE self, VALUE other) { |