|
|
2f07609 |
Mon Feb 25 17:30:29 2008 Technorama Ltd. <oss-ruby@technorama.net>
|
|
|
2f07609 |
* ext/openssl/digest.c ext/openssl/lib/openssl/digest.rb:
|
|
|
2f07609 |
Commit patch #9280 from Akinori MUSHA.
|
|
|
2f07609 |
Simplify the OpenSSL::Digest class and make use of the
|
|
|
2f07609 |
existing Digest framework.
|
|
|
2f07609 |
Enhance performance.
|
|
|
2f07609 |
|
|
|
2f07609 |
Thu Apr 5 14:58:49 2007 Technorama Ltd. <oss-ruby@technorama.net>
|
|
|
2f07609 |
* ext/openssl/ossl_pkcs5.c: New module.
|
|
|
2f07609 |
|
|
|
2f07609 |
* ext/openssl/ossl_{cipher,digest,pkcs7,pkcs12}.c:
|
|
|
2f07609 |
Remove redundant module namespace.
|
|
|
2f07609 |
|
|
|
2f07609 |
* ext/openssl/lib/openssl/{cipher,digest}.rb
|
|
|
2f07609 |
Add backwards compatibile classes for rearranged classes.
|
|
|
2f07609 |
|
|
|
2f07609 |
* ext/openssl/ossl_{pkcs7,pkcs12}.c: Add documentation.
|
|
|
2f07609 |
|
|
|
2f07609 |
Index: ruby_1_8/ext/openssl/lib/openssl/digest.rb
|
|
|
2f07609 |
===================================================================
|
|
|
2f07609 |
--- ruby_1_8/ext/openssl/lib/openssl/digest.rb (revision 11708)
|
|
|
2f07609 |
+++ ruby_1_8/ext/openssl/lib/openssl/digest.rb (revision 15600)
|
|
|
43a073c |
@@ -19,13 +19,17 @@
|
|
|
43a073c |
#require 'openssl'
|
|
|
43a073c |
|
|
|
43a073c |
module OpenSSL
|
|
|
43a073c |
- module Digest
|
|
|
43a073c |
+ class Digest
|
|
|
43a073c |
|
|
|
43a073c |
alg = %w(DSS DSS1 MD2 MD4 MD5 MDC2 RIPEMD160 SHA SHA1)
|
|
|
43a073c |
if OPENSSL_VERSION_NUMBER > 0x00908000
|
|
|
43a073c |
alg += %w(SHA224 SHA256 SHA384 SHA512)
|
|
|
43a073c |
end
|
|
|
43a073c |
|
|
|
43a073c |
+ def self.digest(name, data)
|
|
|
43a073c |
+ super(data, name)
|
|
|
43a073c |
+ end
|
|
|
43a073c |
+
|
|
|
43a073c |
alg.each{|name|
|
|
|
43a073c |
klass = Class.new(Digest){
|
|
|
43a073c |
define_method(:initialize){|*data|
|
|
|
2f07609 |
@@ -44,6 +48,14 @@
|
|
|
43a073c |
const_set(name, klass)
|
|
|
43a073c |
}
|
|
|
43a073c |
|
|
|
43a073c |
+ # This class is only provided for backwards compatibility. Use OpenSSL::Digest in the future.
|
|
|
43a073c |
+ class Digest < Digest
|
|
|
43a073c |
+ def initialize(*args)
|
|
|
43a073c |
+ # add warning
|
|
|
43a073c |
+ super(*args)
|
|
|
43a073c |
+ end
|
|
|
43a073c |
+ end
|
|
|
43a073c |
+
|
|
|
43a073c |
end # Digest
|
|
|
43a073c |
end # OpenSSL
|
|
|
43a073c |
|
|
|
2f07609 |
Index: ruby_1_8/ext/openssl/ossl_digest.c
|
|
|
2f07609 |
===================================================================
|
|
|
2f07609 |
--- ruby_1_8/ext/openssl/ossl_digest.c (revision 11708)
|
|
|
2f07609 |
+++ ruby_1_8/ext/openssl/ossl_digest.c (revision 15600)
|
|
|
2f07609 |
@@ -24,7 +24,6 @@
|
|
|
2f07609 |
/*
|
|
|
2f07609 |
* Classes
|
|
|
2f07609 |
*/
|
|
|
2f07609 |
-VALUE mDigest;
|
|
|
2f07609 |
VALUE cDigest;
|
|
|
2f07609 |
VALUE eDigestError;
|
|
|
43a073c |
|
|
|
2f07609 |
@@ -36,11 +35,23 @@
|
|
|
2f07609 |
const EVP_MD *
|
|
|
2f07609 |
GetDigestPtr(VALUE obj)
|
|
|
2f07609 |
{
|
|
|
2f07609 |
- EVP_MD_CTX *ctx;
|
|
|
2f07609 |
+ const EVP_MD *md;
|
|
|
2f07609 |
|
|
|
2f07609 |
- SafeGetDigest(obj, ctx);
|
|
|
2f07609 |
+ if (TYPE(obj) == T_STRING) {
|
|
|
2f07609 |
+ const char *name = STR2CSTR(obj);
|
|
|
43a073c |
|
|
|
43a073c |
- return EVP_MD_CTX_md(ctx); /*== ctx->digest*/
|
|
|
2f07609 |
+ md = EVP_get_digestbyname(name);
|
|
|
2f07609 |
+ if (!md)
|
|
|
2f07609 |
+ ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
|
|
|
2f07609 |
+ } else {
|
|
|
2f07609 |
+ EVP_MD_CTX *ctx;
|
|
|
2f07609 |
+
|
|
|
2f07609 |
+ SafeGetDigest(obj, ctx);
|
|
|
2f07609 |
+
|
|
|
2f07609 |
+ md = EVP_MD_CTX_md(ctx);
|
|
|
2f07609 |
+ }
|
|
|
2f07609 |
+
|
|
|
2f07609 |
+ return md;
|
|
|
43a073c |
}
|
|
|
43a073c |
|
|
|
43a073c |
VALUE
|
|
|
2f07609 |
@@ -51,7 +62,6 @@
|
|
|
43a073c |
|
|
|
43a073c |
ret = ossl_digest_alloc(cDigest);
|
|
|
43a073c |
GetDigest(ret, ctx);
|
|
|
43a073c |
- EVP_MD_CTX_init(ctx);
|
|
|
43a073c |
EVP_DigestInit_ex(ctx, md, NULL);
|
|
|
43a073c |
|
|
|
43a073c |
return ret;
|
|
|
2f07609 |
@@ -69,14 +79,18 @@
|
|
|
43a073c |
ctx = EVP_MD_CTX_create();
|
|
|
43a073c |
if (ctx == NULL)
|
|
|
43a073c |
ossl_raise(rb_eRuntimeError, "EVP_MD_CTX_create() failed");
|
|
|
43a073c |
- EVP_MD_CTX_init(ctx);
|
|
|
43a073c |
obj = Data_Wrap_Struct(klass, 0, EVP_MD_CTX_destroy, ctx);
|
|
|
43a073c |
-
|
|
|
43a073c |
+
|
|
|
43a073c |
return obj;
|
|
|
43a073c |
}
|
|
|
43a073c |
|
|
|
2f07609 |
VALUE ossl_digest_update(VALUE, VALUE);
|
|
|
2f07609 |
|
|
|
2f07609 |
+/*
|
|
|
2f07609 |
+ * call-seq:
|
|
|
2f07609 |
+ * Digest.new(string) -> digest
|
|
|
2f07609 |
+ *
|
|
|
2f07609 |
+ */
|
|
|
2f07609 |
static VALUE
|
|
|
2f07609 |
ossl_digest_initialize(int argc, VALUE *argv, VALUE self)
|
|
|
2f07609 |
{
|
|
|
2f07609 |
@@ -86,14 +100,9 @@
|
|
|
43a073c |
VALUE type, data;
|
|
|
43a073c |
|
|
|
43a073c |
rb_scan_args(argc, argv, "11", &type, &data);
|
|
|
43a073c |
- StringValue(type);
|
|
|
43a073c |
+ md = GetDigestPtr(type);
|
|
|
43a073c |
if (!NIL_P(data)) StringValue(data);
|
|
|
43a073c |
- name = StringValuePtr(type);
|
|
|
43a073c |
-
|
|
|
43a073c |
- md = EVP_get_digestbyname(name);
|
|
|
43a073c |
- if (!md) {
|
|
|
43a073c |
- ossl_raise(rb_eRuntimeError, "Unsupported digest algorithm (%s).", name);
|
|
|
43a073c |
- }
|
|
|
43a073c |
+
|
|
|
43a073c |
GetDigest(self, ctx);
|
|
|
43a073c |
EVP_DigestInit_ex(ctx, md, NULL);
|
|
|
43a073c |
|
|
|
2f07609 |
@@ -118,6 +127,11 @@
|
|
|
2f07609 |
return self;
|
|
|
2f07609 |
}
|
|
|
2f07609 |
|
|
|
2f07609 |
+/*
|
|
|
2f07609 |
+ * call-seq:
|
|
|
2f07609 |
+ * digest.reset -> self
|
|
|
2f07609 |
+ *
|
|
|
2f07609 |
+ */
|
|
|
2f07609 |
static VALUE
|
|
|
2f07609 |
ossl_digest_reset(VALUE self)
|
|
|
2f07609 |
{
|
|
|
2f07609 |
@@ -129,6 +143,11 @@
|
|
|
2f07609 |
return self;
|
|
|
2f07609 |
}
|
|
|
2f07609 |
|
|
|
2f07609 |
+/*
|
|
|
2f07609 |
+ * call-seq:
|
|
|
2f07609 |
+ * digest.update(string) -> aString
|
|
|
2f07609 |
+ *
|
|
|
2f07609 |
+ */
|
|
|
2f07609 |
VALUE
|
|
|
2f07609 |
ossl_digest_update(VALUE self, VALUE data)
|
|
|
2f07609 |
{
|
|
|
2f07609 |
@@ -136,126 +155,77 @@
|
|
|
2f07609 |
|
|
|
2f07609 |
StringValue(data);
|
|
|
2f07609 |
GetDigest(self, ctx);
|
|
|
2f07609 |
- EVP_DigestUpdate(ctx, RSTRING(data)->ptr, RSTRING(data)->len);
|
|
|
2f07609 |
+ EVP_DigestUpdate(ctx, RSTRING_PTR(data), RSTRING_LEN(data));
|
|
|
2f07609 |
|
|
|
43a073c |
return self;
|
|
|
43a073c |
}
|
|
|
43a073c |
|
|
|
43a073c |
-static void
|
|
|
43a073c |
-digest_final(EVP_MD_CTX *ctx, char **buf, int *buf_len)
|
|
|
43a073c |
-{
|
|
|
43a073c |
- EVP_MD_CTX final;
|
|
|
43a073c |
-
|
|
|
43a073c |
- if (!EVP_MD_CTX_copy(&final, ctx)) {
|
|
|
43a073c |
- ossl_raise(eDigestError, NULL);
|
|
|
43a073c |
- }
|
|
|
43a073c |
- if (!(*buf = OPENSSL_malloc(EVP_MD_CTX_size(&final)))) {
|
|
|
43a073c |
- EVP_MD_CTX_cleanup(&final);
|
|
|
43a073c |
- ossl_raise(eDigestError, "Cannot allocate mem for digest");
|
|
|
43a073c |
- }
|
|
|
43a073c |
- EVP_DigestFinal_ex(&final, *buf, buf_len);
|
|
|
43a073c |
- EVP_MD_CTX_cleanup(&final);
|
|
|
43a073c |
-}
|
|
|
43a073c |
-
|
|
|
2f07609 |
+/*
|
|
|
2f07609 |
+ * call-seq:
|
|
|
2f07609 |
+ * digest.finish -> aString
|
|
|
2f07609 |
+ *
|
|
|
2f07609 |
+ */
|
|
|
2f07609 |
static VALUE
|
|
|
43a073c |
-ossl_digest_digest(VALUE self)
|
|
|
2f07609 |
+ossl_digest_finish(int argc, VALUE *argv, VALUE self)
|
|
|
2f07609 |
{
|
|
|
2f07609 |
EVP_MD_CTX *ctx;
|
|
|
43a073c |
- char *buf;
|
|
|
43a073c |
- int buf_len;
|
|
|
43a073c |
- VALUE digest;
|
|
|
43a073c |
-
|
|
|
43a073c |
- GetDigest(self, ctx);
|
|
|
43a073c |
- digest_final(ctx, &buf, &buf_len);
|
|
|
43a073c |
- digest = ossl_buf2str(buf, buf_len);
|
|
|
43a073c |
-
|
|
|
43a073c |
- return digest;
|
|
|
43a073c |
-}
|
|
|
2f07609 |
+ VALUE str;
|
|
|
2f07609 |
|
|
|
2f07609 |
-static VALUE
|
|
|
43a073c |
-ossl_digest_hexdigest(VALUE self)
|
|
|
2f07609 |
-{
|
|
|
2f07609 |
- EVP_MD_CTX *ctx;
|
|
|
43a073c |
- char *buf, *hexbuf;
|
|
|
43a073c |
- int buf_len;
|
|
|
43a073c |
- VALUE hexdigest;
|
|
|
43a073c |
+ rb_scan_args(argc, argv, "01", &str);
|
|
|
43a073c |
|
|
|
43a073c |
GetDigest(self, ctx);
|
|
|
43a073c |
- digest_final(ctx, &buf, &buf_len);
|
|
|
43a073c |
- if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
|
|
|
43a073c |
- OPENSSL_free(buf);
|
|
|
43a073c |
- ossl_raise(eDigestError, "Memory alloc error");
|
|
|
2f07609 |
+
|
|
|
43a073c |
+ if (NIL_P(str)) {
|
|
|
43a073c |
+ str = rb_str_new(NULL, EVP_MD_CTX_size(ctx));
|
|
|
43a073c |
+ } else {
|
|
|
43a073c |
+ StringValue(str);
|
|
|
43a073c |
+ rb_str_resize(str, EVP_MD_CTX_size(ctx));
|
|
|
43a073c |
}
|
|
|
43a073c |
- OPENSSL_free(buf);
|
|
|
43a073c |
- hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
|
|
|
43a073c |
|
|
|
43a073c |
- return hexdigest;
|
|
|
43a073c |
-}
|
|
|
2f07609 |
+ EVP_DigestFinal_ex(ctx, RSTRING_PTR(str), NULL);
|
|
|
2f07609 |
|
|
|
43a073c |
-static VALUE
|
|
|
43a073c |
-ossl_digest_s_digest(VALUE klass, VALUE str, VALUE data)
|
|
|
43a073c |
-{
|
|
|
43a073c |
- VALUE obj = rb_class_new_instance(1, &str, klass);
|
|
|
2f07609 |
-
|
|
|
43a073c |
- ossl_digest_update(obj, data);
|
|
|
2f07609 |
-
|
|
|
2f07609 |
- return ossl_digest_digest(obj);
|
|
|
43a073c |
+ return str;
|
|
|
2f07609 |
}
|
|
|
43a073c |
|
|
|
2f07609 |
+/*
|
|
|
2f07609 |
+ * call-seq:
|
|
|
2f07609 |
+ * digest.name -> string
|
|
|
2f07609 |
+ *
|
|
|
2f07609 |
+ */
|
|
|
2f07609 |
static VALUE
|
|
|
43a073c |
-ossl_digest_s_hexdigest(VALUE klass, VALUE str, VALUE data)
|
|
|
2f07609 |
+ossl_digest_name(VALUE self)
|
|
|
2f07609 |
{
|
|
|
43a073c |
- VALUE obj = rb_class_new_instance(1, &str, klass);
|
|
|
43a073c |
-
|
|
|
43a073c |
- ossl_digest_update(obj, data);
|
|
|
43a073c |
-
|
|
|
43a073c |
- return ossl_digest_hexdigest(obj);
|
|
|
2f07609 |
-}
|
|
|
2f07609 |
-
|
|
|
2f07609 |
-static VALUE
|
|
|
2f07609 |
-ossl_digest_equal(VALUE self, VALUE other)
|
|
|
2f07609 |
-{
|
|
|
2f07609 |
EVP_MD_CTX *ctx;
|
|
|
2f07609 |
- VALUE str1, str2;
|
|
|
2f07609 |
|
|
|
2f07609 |
- if (rb_obj_is_kind_of(other, cDigest) == Qtrue) {
|
|
|
2f07609 |
- str2 = ossl_digest_digest(other);
|
|
|
2f07609 |
- } else {
|
|
|
2f07609 |
- StringValue(other);
|
|
|
2f07609 |
- str2 = other;
|
|
|
2f07609 |
- }
|
|
|
2f07609 |
GetDigest(self, ctx);
|
|
|
2f07609 |
- if (RSTRING(str2)->len == EVP_MD_CTX_size(ctx)) {
|
|
|
2f07609 |
- str1 = ossl_digest_digest(self);
|
|
|
2f07609 |
- } else {
|
|
|
2f07609 |
- str1 = ossl_digest_hexdigest(self);
|
|
|
2f07609 |
- }
|
|
|
2f07609 |
- if (RSTRING(str1)->len == RSTRING(str2)->len
|
|
|
2f07609 |
- && rb_str_cmp(str1, str2) == 0) {
|
|
|
2f07609 |
- return Qtrue;
|
|
|
2f07609 |
- }
|
|
|
2f07609 |
|
|
|
2f07609 |
- return Qfalse;
|
|
|
2f07609 |
+ return rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
|
|
|
43a073c |
}
|
|
|
43a073c |
|
|
|
2f07609 |
+/*
|
|
|
2f07609 |
+ * call-seq:
|
|
|
2f07609 |
+ * digest.digest_size -> integer
|
|
|
2f07609 |
+ *
|
|
|
2f07609 |
+ * Returns the output size of the digest.
|
|
|
2f07609 |
+ */
|
|
|
43a073c |
static VALUE
|
|
|
2f07609 |
-ossl_digest_name(VALUE self)
|
|
|
2f07609 |
+ossl_digest_size(VALUE self)
|
|
|
2f07609 |
{
|
|
|
2f07609 |
EVP_MD_CTX *ctx;
|
|
|
2f07609 |
|
|
|
2f07609 |
GetDigest(self, ctx);
|
|
|
2f07609 |
|
|
|
2f07609 |
- return rb_str_new2(EVP_MD_name(EVP_MD_CTX_md(ctx)));
|
|
|
2f07609 |
+ return INT2NUM(EVP_MD_CTX_size(ctx));
|
|
|
43a073c |
}
|
|
|
43a073c |
|
|
|
2f07609 |
static VALUE
|
|
|
2f07609 |
-ossl_digest_size(VALUE self)
|
|
|
43a073c |
+ossl_digest_block_length(VALUE self)
|
|
|
2f07609 |
{
|
|
|
2f07609 |
EVP_MD_CTX *ctx;
|
|
|
2f07609 |
|
|
|
2f07609 |
GetDigest(self, ctx);
|
|
|
2f07609 |
|
|
|
2f07609 |
- return INT2NUM(EVP_MD_CTX_size(ctx));
|
|
|
43a073c |
+ return INT2NUM(EVP_MD_CTX_block_size(ctx));
|
|
|
2f07609 |
}
|
|
|
2f07609 |
|
|
|
43a073c |
/*
|
|
|
2f07609 |
@@ -264,31 +234,26 @@
|
|
|
43a073c |
void
|
|
|
43a073c |
Init_ossl_digest()
|
|
|
43a073c |
{
|
|
|
2f07609 |
- mDigest = rb_define_module_under(mOSSL, "Digest");
|
|
|
43a073c |
+ rb_require("openssl");
|
|
|
43a073c |
+ rb_require("digest");
|
|
|
43a073c |
+
|
|
|
2f07609 |
+#if 0 /* let rdoc know about mOSSL */
|
|
|
2f07609 |
+ mOSSL = rb_define_module("OpenSSL");
|
|
|
2f07609 |
+#endif
|
|
|
2f07609 |
+
|
|
|
2f07609 |
+ cDigest = rb_define_class_under(mOSSL, "Digest", rb_path2class("Digest::Class"));
|
|
|
2f07609 |
+ eDigestError = rb_define_class_under(cDigest, "DigestError", eOSSLError);
|
|
|
2f07609 |
|
|
|
43a073c |
- eDigestError = rb_define_class_under(mDigest, "DigestError", eOSSLError);
|
|
|
43a073c |
-
|
|
|
43a073c |
- cDigest = rb_define_class_under(mDigest, "Digest", rb_cObject);
|
|
|
43a073c |
-
|
|
|
43a073c |
rb_define_alloc_func(cDigest, ossl_digest_alloc);
|
|
|
43a073c |
- rb_define_singleton_method(cDigest, "digest", ossl_digest_s_digest, 2);
|
|
|
43a073c |
- rb_define_singleton_method(cDigest, "hexdigest", ossl_digest_s_hexdigest, 2);
|
|
|
43a073c |
-
|
|
|
43a073c |
+
|
|
|
43a073c |
rb_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
|
|
|
43a073c |
- rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
|
|
|
43a073c |
-
|
|
|
43a073c |
rb_define_copy_func(cDigest, ossl_digest_copy);
|
|
|
43a073c |
-
|
|
|
43a073c |
- rb_define_method(cDigest, "digest", ossl_digest_digest, 0);
|
|
|
43a073c |
- rb_define_method(cDigest, "hexdigest", ossl_digest_hexdigest, 0);
|
|
|
43a073c |
- rb_define_alias(cDigest, "inspect", "hexdigest");
|
|
|
43a073c |
- rb_define_alias(cDigest, "to_s", "hexdigest");
|
|
|
43a073c |
-
|
|
|
43a073c |
+ rb_define_method(cDigest, "reset", ossl_digest_reset, 0);
|
|
|
43a073c |
rb_define_method(cDigest, "update", ossl_digest_update, 1);
|
|
|
43a073c |
rb_define_alias(cDigest, "<<", "update");
|
|
|
43a073c |
-
|
|
|
43a073c |
- rb_define_method(cDigest, "==", ossl_digest_equal, 1);
|
|
|
43a073c |
-
|
|
|
43a073c |
+ rb_define_private_method(cDigest, "finish", ossl_digest_finish, -1);
|
|
|
43a073c |
+ rb_define_method(cDigest, "digest_length", ossl_digest_size, 0);
|
|
|
43a073c |
+ rb_define_method(cDigest, "block_length", ossl_digest_block_length, 0);
|
|
|
43a073c |
+
|
|
|
43a073c |
rb_define_method(cDigest, "name", ossl_digest_name, 0);
|
|
|
43a073c |
- rb_define_method(cDigest, "size", ossl_digest_size, 0);
|
|
|
43a073c |
}
|