mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
0a523ab20d
* ext/openssl/extconf.rb: Check existence of accessor functions that don't exist in OpenSSL 0.9.8. OpenSSL 1.1.0 made most of its structures opaque and requires use of these accessor functions. [ruby-core:75225] [Feature #12324] * ext/openssl/openssl_missing.[ch]: Implement them if missing. * ext/openssl/ossl*.c: Use these accessor functions. * test/openssl/test_hmac.rb: Add missing test for HMAC#reset. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55287 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
244 lines
5 KiB
C
244 lines
5 KiB
C
/*
|
|
* 'OpenSSL for Ruby' project
|
|
* Copyright (C) 2001-2002 Michal Rokos <m.rokos@sh.cvut.cz>
|
|
* All rights reserved.
|
|
*/
|
|
/*
|
|
* This program is licensed under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#include "ossl.h"
|
|
|
|
#define NewX509Rev(klass) \
|
|
TypedData_Wrap_Struct((klass), &ossl_x509rev_type, 0)
|
|
#define SetX509Rev(obj, rev) do { \
|
|
if (!(rev)) { \
|
|
ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
|
|
} \
|
|
RTYPEDDATA_DATA(obj) = (rev); \
|
|
} while (0)
|
|
#define GetX509Rev(obj, rev) do { \
|
|
TypedData_Get_Struct((obj), X509_REVOKED, &ossl_x509rev_type, (rev)); \
|
|
if (!(rev)) { \
|
|
ossl_raise(rb_eRuntimeError, "REV wasn't initialized!"); \
|
|
} \
|
|
} while (0)
|
|
#define SafeGetX509Rev(obj, rev) do { \
|
|
OSSL_Check_Kind((obj), cX509Rev); \
|
|
GetX509Rev((obj), (rev)); \
|
|
} while (0)
|
|
|
|
/*
|
|
* Classes
|
|
*/
|
|
VALUE cX509Rev;
|
|
VALUE eX509RevError;
|
|
|
|
static void
|
|
ossl_x509rev_free(void *ptr)
|
|
{
|
|
X509_REVOKED_free(ptr);
|
|
}
|
|
|
|
static const rb_data_type_t ossl_x509rev_type = {
|
|
"OpenSSL/X509/REV",
|
|
{
|
|
0, ossl_x509rev_free,
|
|
},
|
|
0, 0, RUBY_TYPED_FREE_IMMEDIATELY,
|
|
};
|
|
|
|
/*
|
|
* PUBLIC
|
|
*/
|
|
VALUE
|
|
ossl_x509revoked_new(X509_REVOKED *rev)
|
|
{
|
|
X509_REVOKED *new;
|
|
VALUE obj;
|
|
|
|
obj = NewX509Rev(cX509Rev);
|
|
if (!rev) {
|
|
new = X509_REVOKED_new();
|
|
} else {
|
|
new = X509_REVOKED_dup(rev);
|
|
}
|
|
if (!new) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
SetX509Rev(obj, new);
|
|
|
|
return obj;
|
|
}
|
|
|
|
X509_REVOKED *
|
|
DupX509RevokedPtr(VALUE obj)
|
|
{
|
|
X509_REVOKED *rev, *new;
|
|
|
|
SafeGetX509Rev(obj, rev);
|
|
if (!(new = X509_REVOKED_dup(rev))) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
|
|
return new;
|
|
}
|
|
|
|
/*
|
|
* PRIVATE
|
|
*/
|
|
static VALUE
|
|
ossl_x509revoked_alloc(VALUE klass)
|
|
{
|
|
X509_REVOKED *rev;
|
|
VALUE obj;
|
|
|
|
obj = NewX509Rev(klass);
|
|
if (!(rev = X509_REVOKED_new())) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
SetX509Rev(obj, rev);
|
|
|
|
return obj;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
|
|
{
|
|
/* EMPTY */
|
|
return self;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_get_serial(VALUE self)
|
|
{
|
|
X509_REVOKED *rev;
|
|
|
|
GetX509Rev(self, rev);
|
|
|
|
return asn1integer_to_num(X509_REVOKED_get0_serialNumber(rev));
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_set_serial(VALUE self, VALUE num)
|
|
{
|
|
X509_REVOKED *rev;
|
|
ASN1_INTEGER *ai;
|
|
|
|
GetX509Rev(self, rev);
|
|
ai = X509_REVOKED_get0_serialNumber(rev);
|
|
X509_REVOKED_set_serialNumber(rev, num_to_asn1integer(num, ai));
|
|
|
|
return num;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_get_time(VALUE self)
|
|
{
|
|
X509_REVOKED *rev;
|
|
|
|
GetX509Rev(self, rev);
|
|
|
|
return asn1time_to_time(X509_REVOKED_get0_revocationDate(rev));
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_set_time(VALUE self, VALUE time)
|
|
{
|
|
X509_REVOKED *rev;
|
|
|
|
GetX509Rev(self, rev);
|
|
if (!ossl_x509_time_adjust(X509_REVOKED_get0_revocationDate(rev), time))
|
|
ossl_raise(eX509RevError, NULL);
|
|
|
|
return time;
|
|
}
|
|
/*
|
|
* Gets X509v3 extensions as array of X509Ext objects
|
|
*/
|
|
static VALUE
|
|
ossl_x509revoked_get_extensions(VALUE self)
|
|
{
|
|
X509_REVOKED *rev;
|
|
int count, i;
|
|
X509_EXTENSION *ext;
|
|
VALUE ary;
|
|
|
|
GetX509Rev(self, rev);
|
|
count = X509_REVOKED_get_ext_count(rev);
|
|
if (count < 0) {
|
|
OSSL_Debug("count < 0???");
|
|
return rb_ary_new();
|
|
}
|
|
ary = rb_ary_new2(count);
|
|
for (i=0; i<count; i++) {
|
|
ext = X509_REVOKED_get_ext(rev, i);
|
|
rb_ary_push(ary, ossl_x509ext_new(ext));
|
|
}
|
|
|
|
return ary;
|
|
}
|
|
|
|
/*
|
|
* Sets X509_EXTENSIONs
|
|
*/
|
|
static VALUE
|
|
ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
|
|
{
|
|
X509_REVOKED *rev;
|
|
X509_EXTENSION *ext;
|
|
long i;
|
|
VALUE item;
|
|
|
|
Check_Type(ary, T_ARRAY);
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
OSSL_Check_Kind(RARRAY_AREF(ary, i), cX509Ext);
|
|
}
|
|
GetX509Rev(self, rev);
|
|
while ((ext = X509_REVOKED_delete_ext(rev, 0)))
|
|
X509_EXTENSION_free(ext);
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
item = RARRAY_AREF(ary, i);
|
|
ext = DupX509ExtPtr(item);
|
|
if(!X509_REVOKED_add_ext(rev, ext, -1)) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
}
|
|
|
|
return ary;
|
|
}
|
|
|
|
static VALUE
|
|
ossl_x509revoked_add_extension(VALUE self, VALUE ext)
|
|
{
|
|
X509_REVOKED *rev;
|
|
|
|
GetX509Rev(self, rev);
|
|
if(!X509_REVOKED_add_ext(rev, DupX509ExtPtr(ext), -1)) {
|
|
ossl_raise(eX509RevError, NULL);
|
|
}
|
|
|
|
return ext;
|
|
}
|
|
|
|
/*
|
|
* INIT
|
|
*/
|
|
void
|
|
Init_ossl_x509revoked(void)
|
|
{
|
|
eX509RevError = rb_define_class_under(mX509, "RevokedError", eOSSLError);
|
|
|
|
cX509Rev = rb_define_class_under(mX509, "Revoked", rb_cObject);
|
|
|
|
rb_define_alloc_func(cX509Rev, ossl_x509revoked_alloc);
|
|
rb_define_method(cX509Rev, "initialize", ossl_x509revoked_initialize, -1);
|
|
|
|
rb_define_method(cX509Rev, "serial", ossl_x509revoked_get_serial, 0);
|
|
rb_define_method(cX509Rev, "serial=", ossl_x509revoked_set_serial, 1);
|
|
rb_define_method(cX509Rev, "time", ossl_x509revoked_get_time, 0);
|
|
rb_define_method(cX509Rev, "time=", ossl_x509revoked_set_time, 1);
|
|
rb_define_method(cX509Rev, "extensions", ossl_x509revoked_get_extensions, 0);
|
|
rb_define_method(cX509Rev, "extensions=", ossl_x509revoked_set_extensions, 1);
|
|
rb_define_method(cX509Rev, "add_extension", ossl_x509revoked_add_extension, 1);
|
|
}
|