mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
30103702c3
* ext/openssl/extconf.rb: add check for assert.h. * ext/openssl/ossl.c (ossl_buf2str): new function to convert C buffer to String and free buffer. * ext/openssl/ossl.c (ossl_x509_ary2sk): new function to convert Array of OpenSSL::X509 to STACK_OF(X509) with exception safe. * ext/openssl/ossl.c (ossl_to_der, ossl_to_der_if_possible): new functions to convert object to DER string. * ext/openssl/ossl.h: ditto. * ext/openssl/ossl_bio.c (ossl_membio2str): new function to convert BIO to String object and free BIO. * ext/openssl/ossl_bio.h: ditto. * ext/openssl/ossl_pkcs7.c (ossl_pkcs7_to_der): add for "to_der". * ext/openssl/ossl_x509name.c (ossl_x509name_to_der): ditto. * ext/openssl/ossl_x509ext.c (ossl_x509ext_to_der): ditto. * ext/openssl/ossl_x509ext.c (create_ext_from_array): removed and reimplement in openssl/x509.rb. * ext/openssl/ossl_x509attr.c: reimplemented and disable some method temporarily. this class doesn't work fine without ASN.1 data support;-) I'll rewrite in near future. * ext/openssl/lib/openssl/x509.c (X509::Attribute): get rid off unused code. * ext/openssl/lib/openssl/x509.c (X509::ExtensionFactory): refine all. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4558 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
70 lines
1.2 KiB
C
70 lines
1.2 KiB
C
/*
|
|
* $Id$
|
|
* 'OpenSSL for Ruby' team members
|
|
* Copyright (C) 2003
|
|
* All rights reserved.
|
|
*/
|
|
/*
|
|
* This program is licenced under the same licence as Ruby.
|
|
* (See the file 'LICENCE'.)
|
|
*/
|
|
#include "ossl.h"
|
|
|
|
BIO *
|
|
ossl_obj2bio(VALUE obj)
|
|
{
|
|
BIO *bio;
|
|
|
|
if (TYPE(obj) == T_FILE) {
|
|
OpenFile *fptr;
|
|
GetOpenFile(obj, fptr);
|
|
rb_io_check_readable(fptr);
|
|
bio = BIO_new_fp(fptr->f, BIO_NOCLOSE);
|
|
}
|
|
else {
|
|
StringValue(obj);
|
|
bio = BIO_new_mem_buf(RSTRING(obj)->ptr, RSTRING(obj)->len);
|
|
}
|
|
if (!bio) ossl_raise(eOSSLError, NULL);
|
|
|
|
return bio;
|
|
}
|
|
|
|
BIO *
|
|
ossl_protect_obj2bio(VALUE obj, int *status)
|
|
{
|
|
BIO *ret = NULL;
|
|
ret = (BIO*)rb_protect((VALUE(*)_((VALUE)))ossl_obj2bio, obj, status);
|
|
return ret;
|
|
}
|
|
|
|
VALUE
|
|
ossl_membio2str0(BIO *bio)
|
|
{
|
|
VALUE ret;
|
|
BUF_MEM *buf;
|
|
|
|
BIO_get_mem_ptr(bio, &buf);
|
|
ret = rb_str_new(buf->data, buf->length);
|
|
|
|
return ret;
|
|
}
|
|
|
|
VALUE
|
|
ossl_protect_membio2str(BIO *bio, int *status)
|
|
{
|
|
return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
|
|
}
|
|
|
|
VALUE
|
|
ossl_membio2str(BIO *bio)
|
|
{
|
|
VALUE ret;
|
|
int status = 0;
|
|
|
|
ret = ossl_protect_membio2str(bio, &status);
|
|
BIO_free(bio);
|
|
if(status) rb_jump_tag(status);
|
|
|
|
return ret;
|
|
}
|