mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/ossl_pkcs5.c: New module.
* ext/openssl/ossl_{cipher,digest,pkcs7,pkcs12}.c: Remove redundant module namespace. * ext/openssl/lib/openssl/{cipher,digest}.rb Add backwards compatibile classes for rearranged classes. * ext/openssl/ossl_{pkcs7,pkcs12}.c: Add documentation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
f1796fdb2c
commit
953e8aca2b
14 changed files with 245 additions and 56 deletions
|
@ -71,7 +71,6 @@
|
|||
/*
|
||||
* Classes
|
||||
*/
|
||||
VALUE mPKCS7;
|
||||
VALUE cPKCS7;
|
||||
VALUE cPKCS7Signer;
|
||||
VALUE cPKCS7Recipient;
|
||||
|
@ -134,7 +133,8 @@ DupPKCS7RecipientPtr(VALUE obj)
|
|||
}
|
||||
|
||||
/*
|
||||
* Private
|
||||
* call-seq:
|
||||
* PKCS7.read_smime(string) => pkcs7
|
||||
*/
|
||||
static VALUE
|
||||
ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
|
||||
|
@ -156,6 +156,10 @@ ossl_pkcs7_s_read_smime(VALUE klass, VALUE arg)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* PKCS7.write_smime(pkcs7 [, data [, flags]]) => string
|
||||
*/
|
||||
static VALUE
|
||||
ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
|
||||
{
|
||||
|
@ -187,6 +191,10 @@ ossl_pkcs7_s_write_smime(int argc, VALUE *argv, VALUE klass)
|
|||
return str;
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* PKCS7.sign(cert, key, data, [, certs [, flags]]) => pkcs7
|
||||
*/
|
||||
static VALUE
|
||||
ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
|
||||
{
|
||||
|
@ -226,6 +234,10 @@ ossl_pkcs7_s_sign(int argc, VALUE *argv, VALUE klass)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* PKCS7.encrypt(certs, data, [, cipher [, flags]]) => pkcs7
|
||||
*/
|
||||
static VALUE
|
||||
ossl_pkcs7_s_encrypt(int argc, VALUE *argv, VALUE klass)
|
||||
{
|
||||
|
@ -287,6 +299,13 @@ ossl_pkcs7_alloc(VALUE klass)
|
|||
return obj;
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* PKCS7.new => pkcs7
|
||||
* PKCS7.new(string) => pkcs7
|
||||
*
|
||||
* Many methods in this class aren't documented.
|
||||
*/
|
||||
static VALUE
|
||||
ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self)
|
||||
{
|
||||
|
@ -364,6 +383,10 @@ ossl_pkcs7_sym2typeid(VALUE sym)
|
|||
return ret;
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* pkcs7.type = type => type
|
||||
*/
|
||||
static VALUE
|
||||
ossl_pkcs7_set_type(VALUE self, VALUE type)
|
||||
{
|
||||
|
@ -376,6 +399,10 @@ ossl_pkcs7_set_type(VALUE self, VALUE type)
|
|||
return type;
|
||||
}
|
||||
|
||||
/*
|
||||
* call-seq:
|
||||
* pkcs7.type => string or nil
|
||||
*/
|
||||
static VALUE
|
||||
ossl_pkcs7_get_type(VALUE self)
|
||||
{
|
||||
|
@ -926,15 +953,12 @@ ossl_pkcs7ri_get_enc_key(VALUE self)
|
|||
void
|
||||
Init_ossl_pkcs7()
|
||||
{
|
||||
mPKCS7 = rb_define_module_under(mOSSL, "PKCS7");
|
||||
|
||||
ePKCS7Error = rb_define_class_under(mPKCS7, "PKCS7Error", eOSSLError);
|
||||
|
||||
cPKCS7 = rb_define_class_under(mPKCS7, "PKCS7", rb_cObject);
|
||||
rb_define_singleton_method(mPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
|
||||
rb_define_singleton_method(mPKCS7, "write_smime", ossl_pkcs7_s_write_smime, -1);
|
||||
rb_define_singleton_method(mPKCS7, "sign", ossl_pkcs7_s_sign, -1);
|
||||
rb_define_singleton_method(mPKCS7, "encrypt", ossl_pkcs7_s_encrypt, -1);
|
||||
cPKCS7 = rb_define_class_under(mOSSL, "PKCS7", rb_cObject);
|
||||
ePKCS7Error = rb_define_class_under(cPKCS7, "PKCS7Error", eOSSLError);
|
||||
rb_define_singleton_method(cPKCS7, "read_smime", ossl_pkcs7_s_read_smime, 1);
|
||||
rb_define_singleton_method(cPKCS7, "write_smime", ossl_pkcs7_s_write_smime, -1);
|
||||
rb_define_singleton_method(cPKCS7, "sign", ossl_pkcs7_s_sign, -1);
|
||||
rb_define_singleton_method(cPKCS7, "encrypt", ossl_pkcs7_s_encrypt, -1);
|
||||
rb_attr(cPKCS7, rb_intern("data"), 1, 0, Qfalse);
|
||||
rb_attr(cPKCS7, rb_intern("error_string"), 1, 1, Qfalse);
|
||||
rb_define_alloc_func(cPKCS7, ossl_pkcs7_alloc);
|
||||
|
@ -964,8 +988,8 @@ Init_ossl_pkcs7()
|
|||
rb_define_alias(cPKCS7, "to_s", "to_pem");
|
||||
rb_define_method(cPKCS7, "to_der", ossl_pkcs7_to_der, 0);
|
||||
|
||||
cPKCS7Signer = rb_define_class_under(mPKCS7, "SignerInfo", rb_cObject);
|
||||
rb_define_const(mPKCS7, "Signer", cPKCS7Signer);
|
||||
cPKCS7Signer = rb_define_class_under(cPKCS7, "SignerInfo", rb_cObject);
|
||||
rb_define_const(cPKCS7, "Signer", cPKCS7Signer);
|
||||
rb_define_alloc_func(cPKCS7Signer, ossl_pkcs7si_alloc);
|
||||
rb_define_method(cPKCS7Signer, "initialize", ossl_pkcs7si_initialize,3);
|
||||
rb_define_method(cPKCS7Signer, "issuer", ossl_pkcs7si_get_issuer, 0);
|
||||
|
@ -973,14 +997,14 @@ Init_ossl_pkcs7()
|
|||
rb_define_method(cPKCS7Signer, "serial", ossl_pkcs7si_get_serial,0);
|
||||
rb_define_method(cPKCS7Signer,"signed_time",ossl_pkcs7si_get_signed_time,0);
|
||||
|
||||
cPKCS7Recipient = rb_define_class_under(mPKCS7,"RecipientInfo",rb_cObject);
|
||||
cPKCS7Recipient = rb_define_class_under(cPKCS7,"RecipientInfo",rb_cObject);
|
||||
rb_define_alloc_func(cPKCS7Recipient, ossl_pkcs7ri_alloc);
|
||||
rb_define_method(cPKCS7Recipient, "initialize", ossl_pkcs7ri_initialize,1);
|
||||
rb_define_method(cPKCS7Recipient, "issuer", ossl_pkcs7ri_get_issuer,0);
|
||||
rb_define_method(cPKCS7Recipient, "serial", ossl_pkcs7ri_get_serial,0);
|
||||
rb_define_method(cPKCS7Recipient, "enc_key", ossl_pkcs7ri_get_enc_key,0);
|
||||
|
||||
#define DefPKCS7Const(x) rb_define_const(mPKCS7, #x, INT2NUM(PKCS7_##x))
|
||||
#define DefPKCS7Const(x) rb_define_const(cPKCS7, #x, INT2NUM(PKCS7_##x))
|
||||
|
||||
DefPKCS7Const(TEXT);
|
||||
DefPKCS7Const(NOCERTS);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue