mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00

* r25019 by marcandre * ossl_ocsp.c (ossl_ocspres_to_der): Bug fix in Response#to_def. Patch by Chris Chandler [ruby-core:18411] * r25017 by marcandre * ossl_config.c (ossl_config_add_value_m, ossl_config_set_section): Check if frozen (or untrusted for $SECURE >= 4) [ruby-core:18377] * r22925 by nobu * ext/openssl/openssl_missing.h (i2d_of_void): cast for callbacks. [ruby-core:22860] * ext/openssl/ossl_engine.c (ossl_engine_s_by_id): suppress a warning. * ext/openssl/ossl_ssl.c (ossl_sslctx_flush_sessions): time_t may be larger than long. * ext/openssl/ossl_ssl_session.c (ossl_ssl_session_get_time), (ossl_ssl_session_get_timeout): use TIMET2NUM() to convert time_t. * r22924 by nobu * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): should use OPENSSL_free instead of free. a patch from Charlie Savage at [ruby-core:22858]. * r22918 by akr * ext/openssl: suppress warnings. * ext/openssl/ossl.h (OSSL_Debug): don't use gcc extention for variadic macro. * r22666 by akr * ext/openssl/lib/openssl/buffering.rb: define Buffering module under OpenSSL. [ruby-dev:37906] * r22440 by nobu * ext/openssl/ossl_ocsp.c (ossl_ocspbres_verify): OCSP_basic_verify returns positive value on success, not non-zero. [ruby-core:21762] * r22378 by akr * ext/openssl: avoid cyclic require. * ext/openssl/lib/openssl/ssl-internal.rb: renamed from ssl.rb * ext/openssl/lib/openssl/x509-internal.rb: renamed from x509.rb. [ruby-dev:38018] * r22101 by nobu * ext/openssl/ossl_cipher.c (add_cipher_name_to_ary): used conditionally. * r21510 by akr * ext/openssl/ossl.c (ossl_raise): abolish a warning. * r21208 by akr * ext/openssl/ossl_digest.c (GetDigestPtr): use StringValueCStr instead of STR2CSTR. * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_initialize): ditto. (ossl_ec_group_initialize): ditto. * r19420 by mame * ext/openssl/ossl_pkey_ec.c (ossl_ec_key_to_string): comment out fragments of unused code. * r18975 by nobu * ext/openssl/ossl_ocsp.c (ossl_ocspres_initialize): fix for initialization of r18168. * r18971 by nobu * ext/openssl/ossl_config.c (Init_ossl_config): removed C99ism. * r18944 by matz * ext/openssl/ossl_config.c (Init_ossl_config): memory leak fixed. a patch <shinichiro.hamaji at gmail.com> in [ruby-dev:35880]. * ext/openssl/ossl_x509ext.c (ossl_x509ext_set_value): ditto. * r18917 by nobu * ext/openssl/ossl_x509attr.c (ossl_x509attr_initialize): fix for initialization of r18168. * ext/openssl/ossl_ocsp.c (ossl_ocspreq_initialize): ditto. * ext/openssl/ossl_x509name.c (ossl_x509name_initialize): ditto. * r18283 by nobu * ext/openssl/ossl_asn1.c (ossl_asn1_get_asn1type): suppress warnings on platforms which int size differs from pointer size. * r18181 by nobu * ext/openssl/openssl_missing.h (d2i_of_void): define for older versions. [ruby-dev:35637] * r18168 by nobu * ext/openssl: suppress warnings. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@26835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
270 lines
5.5 KiB
C
270 lines
5.5 KiB
C
/*
|
|
* $Id$
|
|
* 'OpenSSL for Ruby' project
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
* All rights reserved.
|
|
*/
|
|
/*
|
|
* This program is licenced under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#if !defined(OPENSSL_NO_HMAC)
|
|
|
|
#include "ossl.h"
|
|
|
|
#define MakeHMAC(obj, klass, ctx) \
|
|
obj = Data_Make_Struct(klass, HMAC_CTX, 0, ossl_hmac_free, ctx)
|
|
#define GetHMAC(obj, ctx) do { \
|
|
Data_Get_Struct(obj, HMAC_CTX, ctx); \
|
|
if (!ctx) { \
|
|
ossl_raise(rb_eRuntimeError, "HMAC wasn't initialized"); \
|
|
} \
|
|
} while (0)
|
|
#define SafeGetHMAC(obj, ctx) do { \
|
|
OSSL_Check_Kind(obj, cHMAC); \
|
|
GetHMAC(obj, ctx); \
|
|
} while (0)
|
|
|
|
/*
|
|
* Classes
|
|
*/
|
|
VALUE cHMAC;
|
|
VALUE eHMACError;
|
|
|
|
/*
|
|
* Public
|
|
*/
|
|
|
|
/*
|
|
* Private
|
|
*/
|
|
static void
|
|
ossl_hmac_free(HMAC_CTX *ctx)
|
|
{
|
|
HMAC_CTX_cleanup(ctx);
|
|
ruby_xfree(ctx);
|
|
}
|
|
|
|
static VALUE
|
|
ossl_hmac_alloc(VALUE klass)
|
|
{
|
|
HMAC_CTX *ctx;
|
|
VALUE obj;
|
|
|
|
MakeHMAC(obj, klass, ctx);
|
|
HMAC_CTX_init(ctx);
|
|
|
|
return obj;
|
|
}
|
|
|
|
|
|
/*
|
|
* call-seq:
|
|
* HMAC.new(key, digest) -> hmac
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_hmac_initialize(VALUE self, VALUE key, VALUE digest)
|
|
{
|
|
HMAC_CTX *ctx;
|
|
|
|
StringValue(key);
|
|
GetHMAC(self, ctx);
|
|
HMAC_Init_ex(ctx, RSTRING_PTR(key), RSTRING_LEN(key),
|
|
GetDigestPtr(digest), NULL);
|
|
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_hmac_copy(VALUE self, VALUE other)
|
|
{
|
|
HMAC_CTX *ctx1, *ctx2;
|
|
|
|
rb_check_frozen(self);
|
|
if (self == other) return self;
|
|
|
|
GetHMAC(self, ctx1);
|
|
SafeGetHMAC(other, ctx2);
|
|
|
|
HMAC_CTX_copy(ctx1, ctx2);
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* hmac.update(string) -> self
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_hmac_update(VALUE self, VALUE data)
|
|
{
|
|
HMAC_CTX *ctx;
|
|
|
|
StringValue(data);
|
|
GetHMAC(self, ctx);
|
|
HMAC_Update(ctx, (unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data));
|
|
|
|
return self;
|
|
}
|
|
|
|
static void
|
|
hmac_final(HMAC_CTX *ctx, unsigned char **buf, unsigned int *buf_len)
|
|
{
|
|
HMAC_CTX final;
|
|
|
|
HMAC_CTX_copy(&final, ctx);
|
|
if (!(*buf = OPENSSL_malloc(HMAC_size(&final)))) {
|
|
HMAC_CTX_cleanup(&final);
|
|
OSSL_Debug("Allocating %d mem", HMAC_size(&final));
|
|
ossl_raise(eHMACError, "Cannot allocate memory for hmac");
|
|
}
|
|
HMAC_Final(&final, *buf, buf_len);
|
|
HMAC_CTX_cleanup(&final);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* hmac.digest -> aString
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_hmac_digest(VALUE self)
|
|
{
|
|
HMAC_CTX *ctx;
|
|
unsigned char *buf;
|
|
unsigned int buf_len;
|
|
VALUE digest;
|
|
|
|
GetHMAC(self, ctx);
|
|
hmac_final(ctx, &buf, &buf_len);
|
|
digest = ossl_buf2str((char *)buf, buf_len);
|
|
|
|
return digest;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* hmac.hexdigest -> aString
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_hmac_hexdigest(VALUE self)
|
|
{
|
|
HMAC_CTX *ctx;
|
|
unsigned char *buf;
|
|
char *hexbuf;
|
|
unsigned int buf_len;
|
|
VALUE hexdigest;
|
|
|
|
GetHMAC(self, ctx);
|
|
hmac_final(ctx, &buf, &buf_len);
|
|
if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
|
|
OPENSSL_free(buf);
|
|
ossl_raise(eHMACError, "Memory alloc error");
|
|
}
|
|
OPENSSL_free(buf);
|
|
hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
|
|
|
|
return hexdigest;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* hmac.reset -> self
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_hmac_reset(VALUE self)
|
|
{
|
|
HMAC_CTX *ctx;
|
|
|
|
GetHMAC(self, ctx);
|
|
HMAC_Init_ex(ctx, NULL, 0, NULL, NULL);
|
|
|
|
return self;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* HMAC.digest(digest, key, data) -> aString
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_hmac_s_digest(VALUE klass, VALUE digest, VALUE key, VALUE data)
|
|
{
|
|
unsigned char *buf;
|
|
unsigned int buf_len;
|
|
|
|
StringValue(key);
|
|
StringValue(data);
|
|
buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
|
|
(unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
|
|
|
|
return rb_str_new((const char *)buf, buf_len);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* HMAC.digest(digest, key, data) -> aString
|
|
*
|
|
*/
|
|
static VALUE
|
|
ossl_hmac_s_hexdigest(VALUE klass, VALUE digest, VALUE key, VALUE data)
|
|
{
|
|
unsigned char *buf;
|
|
char *hexbuf;
|
|
unsigned int buf_len;
|
|
VALUE hexdigest;
|
|
|
|
StringValue(key);
|
|
StringValue(data);
|
|
|
|
buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
|
|
(unsigned char *)RSTRING_PTR(data), RSTRING_LEN(data), NULL, &buf_len);
|
|
if (string2hex(buf, buf_len, &hexbuf, NULL) != 2 * buf_len) {
|
|
ossl_raise(eHMACError, "Cannot convert buf to hexbuf");
|
|
}
|
|
hexdigest = ossl_buf2str(hexbuf, 2 * buf_len);
|
|
|
|
return hexdigest;
|
|
}
|
|
|
|
/*
|
|
* INIT
|
|
*/
|
|
void
|
|
Init_ossl_hmac()
|
|
{
|
|
#if 0 /* let rdoc know about mOSSL */
|
|
mOSSL = rb_define_module("OpenSSL");
|
|
#endif
|
|
|
|
eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
|
|
|
|
cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject);
|
|
|
|
rb_define_alloc_func(cHMAC, ossl_hmac_alloc);
|
|
rb_define_singleton_method(cHMAC, "digest", ossl_hmac_s_digest, 3);
|
|
rb_define_singleton_method(cHMAC, "hexdigest", ossl_hmac_s_hexdigest, 3);
|
|
|
|
rb_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
|
|
rb_define_copy_func(cHMAC, ossl_hmac_copy);
|
|
|
|
rb_define_method(cHMAC, "reset", ossl_hmac_reset, 0);
|
|
rb_define_method(cHMAC, "update", ossl_hmac_update, 1);
|
|
rb_define_alias(cHMAC, "<<", "update");
|
|
rb_define_method(cHMAC, "digest", ossl_hmac_digest, 0);
|
|
rb_define_method(cHMAC, "hexdigest", ossl_hmac_hexdigest, 0);
|
|
rb_define_alias(cHMAC, "inspect", "hexdigest");
|
|
rb_define_alias(cHMAC, "to_s", "hexdigest");
|
|
}
|
|
|
|
#else /* NO_HMAC */
|
|
# warning >>> OpenSSL is compiled without HMAC support <<<
|
|
void
|
|
Init_ossl_hmac()
|
|
{
|
|
rb_warning("HMAC will NOT be avaible: OpenSSL is compiled without HMAC.");
|
|
}
|
|
#endif /* NO_HMAC */
|