summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-25 08:49:36 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-09-25 08:49:36 +0000
commit3a9772f651ddb7e9582c7c3ff5af15615f837d99 (patch)
tree561d200048bc55f32b4d45dca73a65fcfd67bba3
parentfb1f07049fc74830e3e3965de1ce61f010acb266 (diff)
* ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
rb_protect. * ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful value. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--ext/openssl/ossl.c2
-rw-r--r--ext/openssl/ossl_hmac.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 69d7c9b..ce755ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Sep 25 17:48:10 2003 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * ext/openssl/ossl.c (ossl_buf2str): fix type of 1st argument for
+ rb_protect.
+
+ * ext/openssl/ossl_hmac.c (ossl_hmac_digest): should return meaningful
+ value.
+
Thu Sep 25 09:00:00 2003 Nathaniel Talbott <ntalbott@ruby-lang.org>
* lib/ostruct.rb: Added OpenStruct#==.
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 9f605f0..497f254 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -132,7 +132,7 @@ ossl_buf2str(char *buf, int len)
VALUE str;
int status = 0;
- str = rb_protect((VALUE(*)_(()))ossl_str_new, len, &status);
+ str = rb_protect((VALUE(*)_((VALUE)))ossl_str_new, len, &status);
if(!NIL_P(str)) memcpy(RSTRING(str)->ptr, buf, len);
OPENSSL_free(buf);
if(status) rb_jump_tag(status);
diff --git a/ext/openssl/ossl_hmac.c b/ext/openssl/ossl_hmac.c
index 1e5d5bc..0b4d8d9 100644
--- a/ext/openssl/ossl_hmac.c
+++ b/ext/openssl/ossl_hmac.c
@@ -124,7 +124,7 @@ ossl_hmac_digest(VALUE self)
GetHMAC(self, ctx);
hmac_final(ctx, &buf, &buf_len);
- ossl_buf2str(buf, buf_len);
+ digest = ossl_buf2str(buf, buf_len);
return digest;
}