[macruby-changes] [5090] MacRuby/trunk/ext/openssl
source_changes at macosforge.org
source_changes at macosforge.org
Tue Dec 28 01:04:01 PST 2010
Revision: 5090
http://trac.macosforge.org/projects/ruby/changeset/5090
Author: watson1978 at gmail.com
Date: 2010-12-28 01:03:56 -0800 (Tue, 28 Dec 2010)
Log Message:
-----------
ext/openssl: Deleted the whitespace of end of line.
Modified Paths:
--------------
MacRuby/trunk/ext/openssl/ossl.c
MacRuby/trunk/ext/openssl/ossl_asn1.c
MacRuby/trunk/ext/openssl/ossl_asn1.h
MacRuby/trunk/ext/openssl/ossl_bio.c
MacRuby/trunk/ext/openssl/ossl_bn.c
MacRuby/trunk/ext/openssl/ossl_cipher.c
MacRuby/trunk/ext/openssl/ossl_config.c
MacRuby/trunk/ext/openssl/ossl_digest.c
MacRuby/trunk/ext/openssl/ossl_engine.c
MacRuby/trunk/ext/openssl/ossl_hmac.c
MacRuby/trunk/ext/openssl/ossl_ns_spki.c
MacRuby/trunk/ext/openssl/ossl_ocsp.c
MacRuby/trunk/ext/openssl/ossl_pkcs12.c
MacRuby/trunk/ext/openssl/ossl_pkcs7.c
MacRuby/trunk/ext/openssl/ossl_pkey.c
MacRuby/trunk/ext/openssl/ossl_pkey_dh.c
MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c
MacRuby/trunk/ext/openssl/ossl_pkey_ec.c
MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c
MacRuby/trunk/ext/openssl/ossl_rand.c
MacRuby/trunk/ext/openssl/ossl_ssl.c
MacRuby/trunk/ext/openssl/ossl_ssl_session.c
MacRuby/trunk/ext/openssl/ossl_x509attr.c
MacRuby/trunk/ext/openssl/ossl_x509cert.c
MacRuby/trunk/ext/openssl/ossl_x509crl.c
MacRuby/trunk/ext/openssl/ossl_x509ext.c
MacRuby/trunk/ext/openssl/ossl_x509name.c
MacRuby/trunk/ext/openssl/ossl_x509req.c
MacRuby/trunk/ext/openssl/ossl_x509revoked.c
MacRuby/trunk/ext/openssl/ossl_x509store.c
Modified: MacRuby/trunk/ext/openssl/ossl.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -48,7 +48,7 @@
* Data Conversion
*/
STACK_OF(X509) *
-ossl_x509_ary2sk0(VALUE ary)
+ossl_x509_ary2sk0(VALUE ary)
{
STACK_OF(X509) *sk;
VALUE val;
@@ -57,13 +57,13 @@
Check_Type(ary, T_ARRAY);
sk = sk_X509_new_null();
- if (!sk) ossl_raise(eOSSLError, NULL);
+ if (!sk) ossl_raise(eOSSLError, NULL);
for (i = 0; i < RARRAY_LEN(ary); i++) {
val = rb_ary_entry(ary, i);
if (!rb_obj_is_kind_of(val, cX509Cert)) {
sk_X509_pop_free(sk, X509_free);
- ossl_raise(eOSSLError, "object not X509 cert in array");
+ ossl_raise(eOSSLError, "object not X509 cert in array");
}
x509 = DupX509CertPtr(val); /* NEED TO DUP */
sk_X509_push(sk, x509);
@@ -129,7 +129,7 @@
*/
static VALUE
ossl_pem_passwd_cb0(VALUE flag)
-{
+{
VALUE pass;
pass = rb_yield(flag);
@@ -143,7 +143,7 @@
{
int len, status = 0;
VALUE rflag, pass;
-
+
if (pwd || !rb_block_given_p())
return PEM_def_callback(buf, max_len, flag, pwd);
@@ -178,12 +178,12 @@
VALUE
ossl_call_verify_cb_proc(struct ossl_verify_cb_args *args)
-{
+{
return rb_funcall(args->proc, rb_intern("call"), 2,
args->preverify_ok, args->store_ctx);
}
-
-int
+
+int
ossl_verify_cb(int ok, X509_STORE_CTX *ctx)
{
VALUE proc, rctx, ret;
@@ -346,7 +346,7 @@
ossl_debug(const char *fmt, ...)
{
va_list args;
-
+
if (dOSSL == Qtrue) {
fprintf(stderr, "OSSL_DEBUG: ");
va_start(args, fmt);
@@ -379,7 +379,7 @@
{
VALUE old = dOSSL;
dOSSL = val;
-
+
if (old != dOSSL) {
if (dOSSL == Qtrue) {
CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
Modified: MacRuby/trunk/ext/openssl/ossl_asn1.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_asn1.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -27,16 +27,16 @@
{
struct tm tm;
VALUE argv[6];
-
+
if (!time || !time->data) return Qnil;
memset(&tm, 0, sizeof(struct tm));
-
+
switch (time->type) {
case V_ASN1_UTCTIME:
if (sscanf((const char *)time->data, "%2d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
ossl_raise(rb_eTypeError, "bad UTCTIME format");
- }
+ }
if (tm.tm_year < 69) {
tm.tm_year += 2000;
} else {
@@ -47,7 +47,7 @@
if (sscanf((const char *)time->data, "%4d%2d%2d%2d%2d%2dZ", &tm.tm_year, &tm.tm_mon,
&tm.tm_mday, &tm.tm_hour, &tm.tm_min, &tm.tm_sec) != 6) {
ossl_raise(rb_eTypeError, "bad GENERALIZEDTIME format" );
- }
+ }
break;
default:
rb_warning("unknown time format");
@@ -144,7 +144,7 @@
num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
{
BIGNUM *bn = GetBNPtr(obj);
-
+
if (!(ai = BN_to_ASN1_INTEGER(bn, ai))) {
ossl_raise(eOSSLError, NULL);
}
@@ -321,7 +321,7 @@
{
ASN1_INTEGER *ai;
const unsigned char *p;
- VALUE ret;
+ VALUE ret;
int status = 0;
p = der;
@@ -361,7 +361,7 @@
{
ASN1_ENUMERATED *ai;
const unsigned char *p;
- VALUE ret;
+ VALUE ret;
int status = 0;
p = der;
@@ -524,7 +524,7 @@
case V_ASN1_ISO64STRING: /* FALLTHROUGH */
case V_ASN1_GENERALSTRING: /* FALLTHROUGH */
case V_ASN1_UNIVERSALSTRING: /* FALLTHROUGH */
- case V_ASN1_BMPSTRING:
+ case V_ASN1_BMPSTRING:
ptr = obj_to_asn1str(value);
free_func = ASN1_STRING_free;
break;
@@ -660,8 +660,8 @@
return self;
}
-static VALUE
-join_der_i(VALUE i, VALUE str)
+static VALUE
+join_der_i(VALUE i, VALUE str)
{
i = ossl_to_der_if_possible(i);
StringValue(i);
@@ -738,7 +738,7 @@
rb_yield(arg);
}
length -= hlen;
- off += hlen;
+ off += hlen;
if(len > length) ossl_raise(eASN1Error, "value is too short");
if((tc & V_ASN1_PRIVATE) == V_ASN1_PRIVATE)
tag_class = sPRIVATE;
Modified: MacRuby/trunk/ext/openssl/ossl_asn1.h
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_asn1.h 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_asn1.h 2010-12-28 09:03:56 UTC (rev 5090)
@@ -32,12 +32,12 @@
* ASN1 module
*/
extern VALUE mASN1;
-extern VALUE eASN1Error;
+extern VALUE eASN1Error;
extern VALUE cASN1Data;
extern VALUE cASN1Primitive;
extern VALUE cASN1Constructive;
-
+
extern VALUE cASN1Boolean; /* BOOLEAN */
extern VALUE cASN1Integer, cASN1Enumerated; /* INTEGER */
extern VALUE cASN1BitString; /* BIT STRING */
Modified: MacRuby/trunk/ext/openssl/ossl_bio.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_bio.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_bio.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -73,7 +73,7 @@
return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str0, (VALUE)bio, status);
}
-VALUE
+VALUE
ossl_membio2str(BIO *bio)
{
VALUE ret;
Modified: MacRuby/trunk/ext/openssl/ossl_bn.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_bn.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_bn.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -91,7 +91,7 @@
{
BIGNUM *bn;
VALUE obj;
-
+
if (!(bn = BN_new())) {
ossl_raise(eBNError, NULL);
}
@@ -382,7 +382,7 @@
}
WrapBN(CLASS_OF(self), obj1, r1);
WrapBN(CLASS_OF(self), obj2, r2);
-
+
return rb_ary_new3(2, obj1, obj2);
}
@@ -575,7 +575,7 @@
VALUE vnum, vsafe, vadd, vrem, obj;
rb_scan_args(argc, argv, "13", &vnum, &vsafe, &vadd, &vrem);
-
+
num = NUM2INT(vnum);
if (vsafe == Qfalse) {
@@ -593,7 +593,7 @@
ossl_raise(eBNError, NULL);
}
WrapBN(klass, obj, result);
-
+
return obj;
}
@@ -617,14 +617,14 @@
ossl_bn_copy(VALUE self, SEL sel, VALUE other)
{
BIGNUM *bn1, *bn2;
-
+
rb_check_frozen(self);
-
+
if (self == other) return self;
-
+
GetBN(self, bn1);
bn2 = GetBNPtr(other);
-
+
if (!BN_copy(bn1, bn2)) {
ossl_raise(eBNError, NULL);
}
@@ -747,7 +747,7 @@
rb_objc_define_method(*(VALUE *)cBN, "alloc", ossl_bn_alloc, 0);
rb_objc_define_method(cBN, "initialize", ossl_bn_initialize, -1);
-
+
rb_define_copy_func(cBN, ossl_bn_copy);
rb_objc_define_method(cBN, "copy", ossl_bn_copy, 1);
@@ -795,7 +795,7 @@
* value_one - DON'T IMPL.
* set_word
* get_word */
-
+
rb_objc_define_method(*(VALUE *)cBN, "rand", ossl_bn_s_rand, -1);
rb_objc_define_method(*(VALUE *)cBN, "pseudo_rand", ossl_bn_s_pseudo_rand, -1);
rb_objc_define_method(*(VALUE *)cBN, "rand_range", ossl_bn_s_rand_range, 1);
@@ -832,7 +832,7 @@
rb_define_alias(cBN, "to_int", "to_i");
rb_objc_define_method(cBN, "to_bn", ossl_bn_to_bn, 0);
rb_objc_define_method(cBN, "coerce", ossl_bn_coerce, 1);
-
+
/*
* TODO:
* But how to: from_bin, from_mpi? PACK?
Modified: MacRuby/trunk/ext/openssl/ossl_cipher.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_cipher.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_cipher.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -79,7 +79,7 @@
MakeCipher(obj, klass, ctx);
EVP_CIPHER_CTX_init(ctx);
-
+
return obj;
}
@@ -112,7 +112,7 @@
ossl_cipher_copy(VALUE self, SEL sel, VALUE other)
{
EVP_CIPHER_CTX *ctx1, *ctx2;
-
+
rb_check_frozen(self);
if (self == other) return self;
@@ -170,7 +170,7 @@
GetCipher(self, ctx);
if (EVP_CipherInit_ex(ctx, NULL, NULL, NULL, NULL, -1) != 1)
ossl_raise(eCipherError, NULL);
-
+
return self;
}
@@ -287,7 +287,7 @@
digest = NIL_P(vdigest) ? EVP_md5() : GetDigestPtr(vdigest);
GetCipher(self, ctx);
EVP_BytesToKey(EVP_CIPHER_CTX_cipher(ctx), digest, salt,
- (unsigned char *)RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv);
+ (unsigned char *)RSTRING_PTR(vpass), RSTRING_LEN(vpass), iter, key, iv);
if (EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, -1) != 1)
ossl_raise(eCipherError, NULL);
OPENSSL_cleanse(key, sizeof key);
@@ -305,7 +305,7 @@
* +data+ is a nonempty string.
* +buffer+ is an optional string to store the result.
*/
-static VALUE
+static VALUE
ossl_cipher_update(VALUE self, SEL sel, int argc, VALUE *argv)
{
EVP_CIPHER_CTX *ctx;
@@ -347,7 +347,7 @@
*
* See EVP_CipherFinal_ex for further information.
*/
-static VALUE
+static VALUE
ossl_cipher_final(VALUE self, SEL sel)
{
EVP_CIPHER_CTX *ctx;
@@ -448,7 +448,7 @@
{
int len = NUM2INT(key_length);
EVP_CIPHER_CTX *ctx;
-
+
GetCipher(self, ctx);
if (EVP_CIPHER_CTX_set_key_length(ctx, len) != 1)
ossl_raise(eCipherError, NULL);
@@ -518,7 +518,7 @@
/*
* INIT
*/
-void
+void
Init_ossl_cipher(void)
{
#if 0 /* let rdoc know about mOSSL */
Modified: MacRuby/trunk/ext/openssl/ossl_config.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_config.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_config.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -33,8 +33,8 @@
VALUE cConfig;
VALUE eConfigError;
-/*
- * Public
+/*
+ * Public
*/
static CONF *parse_config(VALUE, CONF*);
@@ -154,7 +154,7 @@
_CONF_new_data(conf);
}
#endif
-
+
return self;
}
@@ -187,7 +187,7 @@
OPENSSL_free(cv);
ossl_raise(eConfigError, "_CONF_add_string failure");
}
-
+
return value;
#endif
}
@@ -233,7 +233,7 @@
ossl_config_get_value_old(VALUE self, SEL sel, int argc, VALUE *argv)
{
VALUE section, name;
-
+
rb_scan_args(argc, argv, "11", §ion, &name);
/* support conf.value(nil, "HOME") -> conf.get_value("", "HOME") */
@@ -298,7 +298,7 @@
return hash;
}
for (i=0; i<entries; i++) {
- entry = sk_CONF_VALUE_value(sk, i);
+ entry = sk_CONF_VALUE_value(sk, i);
rb_hash_aset(hash, rb_str_new2(entry->name), rb_str_new2(entry->value));
}
Modified: MacRuby/trunk/ext/openssl/ossl_digest.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_digest.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_digest.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -56,14 +56,14 @@
VALUE
ossl_digest_new(const EVP_MD *md)
-{
+{
VALUE ret;
EVP_MD_CTX *ctx;
ret = ossl_digest_alloc(cDigest, 0);
GetDigest(ret, ctx);
EVP_DigestInit_ex(ctx, md, NULL);
-
+
return ret;
}
@@ -104,7 +104,7 @@
GetDigest(self, ctx);
EVP_DigestInit_ex(ctx, md, NULL);
-
+
if (!NIL_P(data)) return ossl_digest_update(self, 0, data);
return self;
}
@@ -113,7 +113,7 @@
ossl_digest_copy(VALUE self, SEL sel, VALUE other)
{
EVP_MD_CTX *ctx1, *ctx2;
-
+
rb_check_frozen(self);
if (self == other) return self;
@@ -243,7 +243,7 @@
cDigest = rb_define_class_under(mOSSL, "Digest", rb_path2class("Digest::Class"));
eDigestError = rb_define_class_under(cDigest, "DigestError", eOSSLError);
-
+
rb_objc_define_method(*(VALUE *)cDigest, "alloc", ossl_digest_alloc, 0);
rb_objc_define_method(cDigest, "initialize", ossl_digest_initialize, -1);
Modified: MacRuby/trunk/ext/openssl/ossl_engine.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_engine.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_engine.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -29,7 +29,7 @@
GetPKCS7(obj, engine); \
} while (0)
-/*
+/*
* Classes
*/
VALUE cEngine;
@@ -327,7 +327,7 @@
{
VALUE str;
const char *cname = rb_class2name(rb_obj_class(self));
-
+
str = rb_str_new2("#<");
rb_str_cat2(str, cname);
rb_str_cat2(str, " id=\"");
Modified: MacRuby/trunk/ext/openssl/ossl_hmac.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_hmac.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_hmac.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -53,7 +53,7 @@
MakeHMAC(obj, klass, ctx);
HMAC_CTX_init(ctx);
-
+
return obj;
}
@@ -80,7 +80,7 @@
ossl_hmac_copy(VALUE self, SEL sel, VALUE other)
{
HMAC_CTX *ctx1, *ctx2;
-
+
rb_check_frozen(self);
if (self == other) return self;
@@ -135,11 +135,11 @@
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;
}
@@ -156,7 +156,7 @@
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) {
@@ -195,7 +195,7 @@
{
unsigned char *buf;
unsigned int buf_len;
-
+
StringValue(key);
StringValue(data);
buf = HMAC(GetDigestPtr(digest), RSTRING_PTR(key), RSTRING_LEN(key),
@@ -219,7 +219,7 @@
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) {
@@ -241,13 +241,13 @@
#endif
eHMACError = rb_define_class_under(mOSSL, "HMACError", eOSSLError);
-
+
cHMAC = rb_define_class_under(mOSSL, "HMAC", rb_cObject);
rb_objc_define_method(*(VALUE *)cHMAC, "alloc", ossl_hmac_alloc, 0);
rb_objc_define_method(*(VALUE *)cHMAC, "digest", ossl_hmac_s_digest, 3);
rb_objc_define_method(*(VALUE *)cHMAC, "hexdigest", ossl_hmac_s_hexdigest, 3);
-
+
rb_objc_define_method(cHMAC, "initialize", ossl_hmac_initialize, 2);
rb_define_copy_func(cHMAC, ossl_hmac_copy);
Modified: MacRuby/trunk/ext/openssl/ossl_ns_spki.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_ns_spki.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_ns_spki.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -42,12 +42,12 @@
{
NETSCAPE_SPKI *spki;
VALUE obj;
-
+
if (!(spki = NETSCAPE_SPKI_new())) {
ossl_raise(eSPKIError, NULL);
- }
+ }
WrapSPKI(klass, obj, spki);
-
+
return obj;
}
@@ -57,7 +57,7 @@
NETSCAPE_SPKI *spki;
VALUE buffer;
const unsigned char *p;
-
+
if (rb_scan_args(argc, argv, "01", &buffer) == 0) {
return self;
}
@@ -92,7 +92,7 @@
if (i2d_NETSCAPE_SPKI(spki, &p) <= 0)
ossl_raise(eX509CertError, NULL);
ossl_str_adjust(str, p);
-
+
return str;
}
@@ -102,7 +102,7 @@
NETSCAPE_SPKI *spki;
char *data;
VALUE str;
-
+
GetSPKI(self, spki);
if (!(data = NETSCAPE_SPKI_b64_encode(spki))) {
ossl_raise(eSPKIError, NULL);
@@ -119,7 +119,7 @@
BIO *out;
BUF_MEM *buf;
VALUE str;
-
+
GetSPKI(self, spki);
if (!(out = BIO_new(BIO_s_mem()))) {
ossl_raise(eSPKIError, NULL);
@@ -131,7 +131,7 @@
BIO_get_mem_ptr(out, &buf);
str = rb_str_new(buf->data, buf->length);
BIO_free(out);
-
+
return str;
}
@@ -188,7 +188,7 @@
RSTRING_LEN(str))) {
ossl_raise(eSPKIError, NULL);
}
-
+
return str;
}
@@ -236,14 +236,14 @@
Init_ossl_ns_spki()
{
mNetscape = rb_define_module_under(mOSSL, "Netscape");
-
+
eSPKIError = rb_define_class_under(mNetscape, "SPKIError", eOSSLError);
-
+
cSPKI = rb_define_class_under(mNetscape, "SPKI", rb_cObject);
-
+
rb_objc_define_method(*(VALUE *)cSPKI, "alloc", ossl_spki_alloc, 0);
rb_objc_define_method(cSPKI, "initialize", ossl_spki_initialize, -1);
-
+
rb_objc_define_method(cSPKI, "to_der", ossl_spki_to_der, 0);
rb_objc_define_method(cSPKI, "to_pem", ossl_spki_to_pem, 0);
rb_define_alias(cSPKI, "to_s", "to_pem");
Modified: MacRuby/trunk/ext/openssl/ossl_ocsp.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_ocsp.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_ocsp.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -560,7 +560,7 @@
}
return ret;
-}
+}
static VALUE
ossl_ocspbres_sign(VALUE self, SEL sel, int argc, VALUE *argv)
Modified: MacRuby/trunk/ext/openssl/ossl_pkcs12.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkcs12.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_pkcs12.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -81,7 +81,7 @@
STACK_OF(X509) *x509s;
int nkey = 0, ncert = 0, kiter = 0, miter = 0, ktype = 0;
PKCS12 *p12;
-
+
rb_scan_args(argc, argv, "46", &pass, &name, &pkey, &cert, &ca, &key_nid, &cert_nid, &key_iter, &mac_iter, &keytype);
passphrase = NIL_P(pass) ? NULL : StringValuePtr(pass);
friendlyname = NIL_P(name) ? NULL : StringValuePtr(name);
Modified: MacRuby/trunk/ext/openssl/ossl_pkcs7.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkcs7.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_pkcs7.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -68,7 +68,7 @@
#define ossl_pkcs7_set_err_string(o,v) rb_iv_set((o), "@error_string", (v))
#define ossl_pkcs7_get_err_string(o) rb_iv_get((o), "@error_string")
-/*
+/*
* Classes
*/
VALUE cPKCS7;
@@ -97,7 +97,7 @@
DupPKCS7SignerPtr(VALUE obj)
{
PKCS7_SIGNER_INFO *p7si, *pkcs7;
-
+
SafeGetPKCS7si(obj, p7si);
if (!(pkcs7 = PKCS7_SIGNER_INFO_dup(p7si))) {
ossl_raise(ePKCS7Error, NULL);
@@ -123,7 +123,7 @@
DupPKCS7RecipientPtr(VALUE obj)
{
PKCS7_RECIP_INFO *p7ri, *pkcs7;
-
+
SafeGetPKCS7ri(obj, p7ri);
if (!(pkcs7 = PKCS7_RECIP_INFO_dup(p7ri))) {
ossl_raise(ePKCS7Error, NULL);
@@ -295,7 +295,7 @@
ossl_raise(ePKCS7Error, NULL);
}
WrapPKCS7(klass, obj, pkcs7);
-
+
return obj;
}
@@ -495,7 +495,7 @@
PKCS7_SIGNER_INFO *si;
int num, i;
VALUE ary;
-
+
GetPKCS7(self, pkcs7);
if (!(sk = PKCS7_get_signer_info(pkcs7))) {
OSSL_Debug("OpenSSL::PKCS7#get_signer_info == NULL!");
@@ -537,7 +537,7 @@
PKCS7_RECIP_INFO *si;
int num, i;
VALUE ary;
-
+
GetPKCS7(self, pkcs7);
if (PKCS7_type_is_enveloped(pkcs7))
sk = pkcs7->d.enveloped->recipientinfo;
@@ -757,7 +757,7 @@
}
if(!PKCS7_dataFinal(pkcs7, out)) goto err;
ossl_pkcs7_set_data(self, Qnil);
-
+
err:
BIO_free(out);
BIO_free(in);
@@ -795,7 +795,7 @@
PKCS7 *pkcs7;
BIO *out;
VALUE str;
-
+
GetPKCS7(self, pkcs7);
if (!(out = BIO_new(BIO_s_mem()))) {
ossl_raise(ePKCS7Error, NULL);
@@ -870,9 +870,9 @@
{
PKCS7_SIGNER_INFO *p7si;
ASN1_TYPE *asn1obj;
-
+
GetPKCS7si(self, p7si);
-
+
if (!(asn1obj = PKCS7_get_signed_attribute(p7si, NID_pkcs9_signingTime))) {
ossl_raise(ePKCS7Error, NULL);
}
@@ -1002,10 +1002,10 @@
cPKCS7Recipient = rb_define_class_under(cPKCS7,"RecipientInfo",rb_cObject);
rb_objc_define_method(*(VALUE *)cPKCS7Recipient, "alloc", ossl_pkcs7ri_alloc, 0);
- rb_objc_define_method(cPKCS7Recipient, "initialize", ossl_pkcs7ri_initialize,1);
+ rb_objc_define_method(cPKCS7Recipient, "initialize", ossl_pkcs7ri_initialize,1);
rb_objc_define_method(cPKCS7Recipient, "issuer", ossl_pkcs7ri_get_issuer,0);
rb_objc_define_method(cPKCS7Recipient, "serial", ossl_pkcs7ri_get_serial,0);
- rb_objc_define_method(cPKCS7Recipient, "enc_key", ossl_pkcs7ri_get_enc_key,0);
+ rb_objc_define_method(cPKCS7Recipient, "enc_key", ossl_pkcs7ri_get_enc_key,0);
#define DefPKCS7Const(x) rb_define_const(cPKCS7, #x, INT2NUM(PKCS7_##x))
Modified: MacRuby/trunk/ext/openssl/ossl_pkey.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkey.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_pkey.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -99,7 +99,7 @@
GetPrivPKeyPtr(VALUE obj)
{
EVP_PKEY *pkey;
-
+
if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
ossl_raise(rb_eArgError, "Private key is needed.");
}
@@ -112,7 +112,7 @@
DupPKeyPtr(VALUE obj)
{
EVP_PKEY *pkey;
-
+
SafeGetPKey(obj, pkey);
CRYPTO_add(&pkey->references, 1, CRYPTO_LOCK_EVP_PKEY);
@@ -123,7 +123,7 @@
DupPrivPKeyPtr(VALUE obj)
{
EVP_PKEY *pkey;
-
+
if (rb_funcall(obj, id_private_q, 0, NULL) != Qtrue) {
ossl_raise(rb_eArgError, "Private key is needed.");
}
@@ -215,21 +215,21 @@
#if 0 /* let rdoc know about mOSSL */
mOSSL = rb_define_module("OpenSSL");
#endif
-
+
mPKey = rb_define_module_under(mOSSL, "PKey");
-
+
ePKeyError = rb_define_class_under(mPKey, "PKeyError", eOSSLError);
cPKey = rb_define_class_under(mPKey, "PKey", rb_cObject);
-
+
rb_objc_define_method(*(VALUE *)cPKey, "alloc", ossl_pkey_alloc, 0);
rb_objc_define_method(cPKey, "initialize", ossl_pkey_initialize, 0);
rb_objc_define_method(cPKey, "sign", ossl_pkey_sign, 2);
rb_objc_define_method(cPKey, "verify", ossl_pkey_verify, 3);
-
+
id_private_q = rb_intern("private?");
-
+
/*
* INIT rsa, dsa, dh, ec
*/
Modified: MacRuby/trunk/ext/openssl/ossl_pkey_dh.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkey_dh.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_pkey_dh.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -42,7 +42,7 @@
{
EVP_PKEY *pkey;
VALUE obj;
-
+
if (!dh) {
return Qfalse;
}
@@ -85,7 +85,7 @@
dh_generate(int size, int gen)
{
DH *dh;
-
+
dh = DH_generate_parameters(size, gen,
rb_block_given_p() ? ossl_generate_cb : NULL,
NULL);
@@ -114,7 +114,7 @@
DH *dh ;
int g = 2;
VALUE size, gen, obj;
-
+
if (rb_scan_args(argc, argv, "11", &size, &gen) == 2) {
g = NUM2INT(gen);
}
@@ -208,7 +208,7 @@
EVP_PKEY *pkey;
GetPKeyDH(self, pkey);
-
+
return (DH_PRIVATE(pkey->pkey.dh)) ? Qtrue : Qfalse;
}
@@ -244,7 +244,7 @@
*/
static VALUE
ossl_dh_to_der(VALUE self)
-{
+{
EVP_PKEY *pkey;
unsigned char *p;
long len;
@@ -285,7 +285,7 @@
rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dh->g));
rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dh->pub_key));
rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dh->priv_key));
-
+
return hash;
}
@@ -329,7 +329,7 @@
EVP_PKEY *pkey;
DH *dh;
VALUE obj;
-
+
GetPKeyDH(self, pkey);
dh = DHparams_dup(pkey->pkey.dh); /* err check perfomed by dh_instance */
obj = dh_instance(CLASS_OF(self), dh);
@@ -352,7 +352,7 @@
DH *dh;
EVP_PKEY *pkey;
int codes;
-
+
GetPKeyDH(self, pkey);
dh = pkey->pkey.dh;
@@ -438,10 +438,10 @@
0x08, 0x04, 0x8c, 0x52, 0x8f, 0xe3, 0x4a, 0x31,
0x44, 0x47, 0x19, 0xa1, 0x4a, 0xc8, 0x8b, 0xcb,
};
-static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 };
+static unsigned char DEFAULT_DH_512_GEN[] = { 0x02 };
DH *OSSL_DEFAULT_DH_512 = NULL;
-
-/*
+
+/*
* -----BEGIN DH PARAMETERS-----
* MIGHAoGBAJ0lOVy0VIr/JebWn0zDwY2h+rqITFOpdNr6ugsgvkDXuucdcChhYExJ
* AV/ZD2AWPbrTqV76mGRgJg4EddgT1zG0jq3rnFdMj2XzkBYx3BVvfR0Arnby0RHR
Modified: MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_pkey_dsa.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -36,7 +36,7 @@
{
EVP_PKEY *pkey;
VALUE obj;
-
+
if (!dsa) {
return Qfalse;
}
@@ -145,7 +145,7 @@
BIO *in;
char *passwd = NULL;
VALUE arg, pass;
-
+
GetPKey(self, pkey);
if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
dsa = DSA_new();
@@ -211,9 +211,9 @@
ossl_dsa_is_private(VALUE self)
{
EVP_PKEY *pkey;
-
+
GetPKeyDSA(self, pkey);
-
+
return (DSA_PRIVATE(self, pkey->pkey.dsa)) ? Qtrue : Qfalse;
}
@@ -321,7 +321,7 @@
rb_hash_aset(hash, rb_str_new2("g"), ossl_bn_new(pkey->pkey.dsa->g));
rb_hash_aset(hash, rb_str_new2("pub_key"), ossl_bn_new(pkey->pkey.dsa->pub_key));
rb_hash_aset(hash, rb_str_new2("priv_key"), ossl_bn_new(pkey->pkey.dsa->priv_key));
-
+
return hash;
}
@@ -365,7 +365,7 @@
EVP_PKEY *pkey;
DSA *dsa;
VALUE obj;
-
+
GetPKeyDSA(self, pkey);
/* err check performed by dsa_instance */
dsa = DSAPublicKey_dup(pkey->pkey.dsa);
@@ -455,7 +455,7 @@
eDSAError = rb_define_class_under(mPKey, "DSAError", ePKeyError);
cDSA = rb_define_class_under(mPKey, "DSA", cPKey);
-
+
rb_objc_define_method(*(VALUE *)cDSA, "generate", ossl_dsa_s_generate, 1);
rb_objc_define_method(cDSA, "initialize", ossl_dsa_initialize, -1);
Modified: MacRuby/trunk/ext/openssl/ossl_pkey_ec.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkey_ec.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_pkey_ec.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -110,7 +110,7 @@
{
EVP_PKEY *pkey;
VALUE obj;
-
+
if (!ec) {
return Qfalse;
}
@@ -163,7 +163,7 @@
EC_KEY *ec = NULL;
VALUE arg, pass;
VALUE group = Qnil;
-
+
GetPKey(self, pkey);
if (pkey->pkey.ec)
rb_raise(eECError, "EC_KEY already initialized");
@@ -274,7 +274,7 @@
* the group.
*
* Setting the group will immediately destroy any previously assigned group object.
- * The group is internally copied by OpenSSL. Modifying the original group after
+ * The group is internally copied by OpenSSL. Modifying the original group after
* assignment will not effect the internal key structure.
* (your changes may be lost). BE CAREFUL.
*
@@ -1026,7 +1026,7 @@
}
/* call-seq:
- * group.point_conversion_form => :uncompressed | :compressed | :hybrid
+ * group.point_conversion_form => :uncompressed | :compressed | :hybrid
*
* See the OpenSSL documentation for EC_GROUP_get_point_conversion_form()
*/
@@ -1046,7 +1046,7 @@
case POINT_CONVERSION_HYBRID: ret = ID_hybrid; break;
default: rb_raise(eEC_GROUP, "unsupported point conversion form: %d, this module should be updated", form);
}
-
+
return ID2SYM(ret);
}
@@ -1273,7 +1273,7 @@
rb_raise(rb_eArgError, "1st argument must be OpenSSL::PKey::EC::Group");
group_v = arg1;
SafeRequire_EC_GROUP(group_v, group);
-
+
if (rb_obj_is_kind_of(arg2, cBN)) {
const BIGNUM *bn = GetBNPtr(arg2);
Modified: MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_pkey_rsa.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -36,7 +36,7 @@
{
EVP_PKEY *pkey;
VALUE obj;
-
+
if (!rsa) {
return Qfalse;
}
@@ -48,7 +48,7 @@
return Qfalse;
}
WrapPKey(klass, obj, pkey);
-
+
return obj;
}
@@ -124,7 +124,7 @@
* * +pass+ is an optional string with the password to decrypt the encoded key.
*
* === Examples
- * * RSA.new(2048) -> rsa
+ * * RSA.new(2048) -> rsa
* * RSA.new(File.read("rsa.pem")) -> rsa
* * RSA.new(File.read("rsa.pem"), "mypassword") -> rsa
*/
@@ -136,7 +136,7 @@
BIO *in;
char *passwd = NULL;
VALUE arg, pass;
-
+
GetPKey(self, pkey);
if(rb_scan_args(argc, argv, "02", &arg, &pass) == 0) {
rsa = RSA_new();
@@ -209,9 +209,9 @@
ossl_rsa_is_private(VALUE self)
{
EVP_PKEY *pkey;
-
+
GetPKeyRSA(self, pkey);
-
+
return (RSA_PRIVATE(self, pkey->pkey.rsa)) ? Qtrue : Qfalse;
}
@@ -262,7 +262,7 @@
}
}
str = ossl_membio2str(out);
-
+
return str;
}
@@ -349,7 +349,7 @@
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_bstr_resize(str, buf_len);
-
+
return str;
}
@@ -368,7 +368,7 @@
GetPKeyRSA(self, pkey);
if (!RSA_PRIVATE(self, pkey->pkey.rsa)) {
ossl_raise(eRSAError, "private key needed.");
- }
+ }
rb_scan_args(argc, argv, "11", &buffer, &padding);
pad = (argc == 1) ? RSA_PKCS1_PADDING : NUM2INT(padding);
StringValue(buffer);
@@ -379,7 +379,7 @@
pad);
if (buf_len < 0) ossl_raise(eRSAError, NULL);
rb_bstr_resize(str, buf_len);
-
+
return str;
}
@@ -440,7 +440,7 @@
rb_hash_aset(hash, rb_str_new2("dmp1"), ossl_bn_new(pkey->pkey.rsa->dmp1));
rb_hash_aset(hash, rb_str_new2("dmq1"), ossl_bn_new(pkey->pkey.rsa->dmq1));
rb_hash_aset(hash, rb_str_new2("iqmp"), ossl_bn_new(pkey->pkey.rsa->iqmp));
-
+
return hash;
}
@@ -484,7 +484,7 @@
EVP_PKEY *pkey;
RSA *rsa;
VALUE obj;
-
+
GetPKeyRSA(self, pkey);
/* err check performed by rsa_instance */
rsa = RSAPublicKey_dup(pkey->pkey.rsa);
@@ -503,7 +503,7 @@
ossl_rsa_blinding_on(VALUE self)
{
EVP_PKEY *pkey;
-
+
GetPKeyRSA(self, pkey);
if (RSA_blinding_on(pkey->pkey.rsa, ossl_bn_ctx) != 1) {
@@ -516,7 +516,7 @@
ossl_rsa_blinding_off(VALUE self)
{
EVP_PKEY *pkey;
-
+
GetPKeyRSA(self, pkey);
RSA_blinding_off(pkey->pkey.rsa);
@@ -552,7 +552,7 @@
rb_objc_define_method(*(VALUE *)cRSA, "generate", ossl_rsa_s_generate, -1);
rb_objc_define_method(cRSA, "initialize", ossl_rsa_initialize, -1);
-
+
rb_objc_define_method(cRSA, "public?", ossl_rsa_is_public, 0);
rb_objc_define_method(cRSA, "private?", ossl_rsa_is_private, 0);
rb_objc_define_method(cRSA, "to_text", ossl_rsa_to_text, 0);
Modified: MacRuby/trunk/ext/openssl/ossl_rand.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_rand.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_rand.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -65,7 +65,7 @@
ossl_rand_load_file(VALUE self, SEL sel, VALUE filename)
{
SafeStringValue(filename);
-
+
if(!RAND_load_file(RSTRING_PTR(filename), -1)) {
ossl_raise(eRandomError, NULL);
}
@@ -138,7 +138,7 @@
ossl_rand_egd(VALUE self, SEL sel, VALUE filename)
{
SafeStringValue(filename);
-
+
if(!RAND_egd(RSTRING_PTR(filename))) {
ossl_raise(eRandomError, NULL);
}
@@ -190,9 +190,9 @@
#endif
mRandom = rb_define_module_under(mOSSL, "Random");
-
+
eRandomError = rb_define_class_under(mRandom, "RandomError", eOSSLError);
-
+
DEFMETH(mRandom, "seed", ossl_rand_seed, 1);
DEFMETH(mRandom, "random_add", ossl_rand_add, 2);
DEFMETH(mRandom, "load_random_file", ossl_rand_load_file, 1);
@@ -200,7 +200,7 @@
DEFMETH(mRandom, "random_bytes", ossl_rand_bytes, 1);
DEFMETH(mRandom, "pseudo_bytes", ossl_rand_pseudo_bytes, 1);
DEFMETH(mRandom, "egd", ossl_rand_egd, 1);
- DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
+ DEFMETH(mRandom, "egd_bytes", ossl_rand_egd_bytes, 2);
DEFMETH(mRandom, "status?", ossl_rand_status, 0)
}
Modified: MacRuby/trunk/ext/openssl/ossl_ssl.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_ssl.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_ssl.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -95,7 +95,7 @@
#ifdef HAVE_SSL_SET_TLSEXT_HOST_NAME
"hostname",
#endif
- "sync_close",
+ "sync_close",
};
ID ID_callback_state;
@@ -308,7 +308,7 @@
ossl_call_session_get_cb(VALUE ary)
{
VALUE ssl_obj, sslctx_obj, cb;
-
+
Check_Type(ary, T_ARRAY);
ssl_obj = rb_ary_entry(ary, 0);
@@ -355,7 +355,7 @@
ossl_call_session_new_cb(VALUE ary)
{
VALUE ssl_obj, sslctx_obj, cb;
-
+
Check_Type(ary, T_ARRAY);
ssl_obj = rb_ary_entry(ary, 0);
@@ -402,7 +402,7 @@
ossl_call_session_remove_cb(VALUE ary)
{
VALUE sslctx_obj, cb;
-
+
Check_Type(ary, T_ARRAY);
sslctx_obj = rb_ary_entry(ary, 0);
@@ -1590,7 +1590,7 @@
rb_objc_define_method(cSSLContext, "setup", ossl_sslctx_setup, 0);
-
+
rb_define_const(cSSLContext, "SESSION_CACHE_OFF", LONG2FIX(SSL_SESS_CACHE_OFF));
rb_define_const(cSSLContext, "SESSION_CACHE_CLIENT", LONG2FIX(SSL_SESS_CACHE_CLIENT)); /* doesn't actually do anything in 0.9.8e */
rb_define_const(cSSLContext, "SESSION_CACHE_SERVER", LONG2FIX(SSL_SESS_CACHE_SERVER));
Modified: MacRuby/trunk/ext/openssl/ossl_ssl_session.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_ssl_session.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_ssl_session.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -15,8 +15,8 @@
OSSL_Check_Kind(obj, cSSLSession); \
GetSSLSession(obj, sess); \
} while (0)
-
+
VALUE cSSLSession;
static VALUE eSSLSession;
@@ -214,7 +214,7 @@
BUF_MEM *buf;
VALUE str;
int i;
-
+
GetSSLSession(self, ctx);
if (!(out = BIO_new(BIO_s_mem()))) {
@@ -246,7 +246,7 @@
BIO *out;
BUF_MEM *buf;
VALUE str;
-
+
GetSSLSession(self, ctx);
if (!(out = BIO_new(BIO_s_mem()))) {
@@ -264,8 +264,8 @@
return str;
}
-
+
void Init_ossl_ssl_session(void)
{
#if 0 /* let rdoc know about mOSSL */
Modified: MacRuby/trunk/ext/openssl/ossl_x509attr.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509attr.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509attr.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -41,7 +41,7 @@
{
X509_ATTRIBUTE *new;
VALUE obj;
-
+
if (!attr) {
new = X509_ATTRIBUTE_new();
} else {
@@ -77,7 +77,7 @@
X509_ATTRIBUTE *attr;
VALUE obj;
- if (!(attr = X509_ATTRIBUTE_new()))
+ if (!(attr = X509_ATTRIBUTE_new()))
ossl_raise(eX509AttrError, NULL);
WrapX509Attr(klass, obj, attr);
@@ -123,14 +123,14 @@
X509_ATTRIBUTE *attr;
ASN1_OBJECT *obj;
char *s;
-
+
s = StringValuePtr(oid);
obj = OBJ_txt2obj(s, 0);
if(!obj) obj = OBJ_txt2obj(s, 1);
if(!obj) ossl_raise(eX509AttrError, NULL);
GetX509Attr(self, attr);
X509_ATTRIBUTE_set1_object(attr, obj);
-
+
return oid;
}
@@ -157,7 +157,7 @@
i2a_ASN1_OBJECT(out, oid);
ret = ossl_membio2str(out);
}
-
+
return ret;
}
Modified: MacRuby/trunk/ext/openssl/ossl_x509cert.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509cert.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509cert.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -51,11 +51,11 @@
ossl_raise(eX509CertError, NULL);
}
WrapX509(cX509Cert, obj, new);
-
+
return obj;
}
-VALUE
+VALUE
ossl_x509_new_from_file(VALUE filename)
{
X509 *x509;
@@ -90,9 +90,9 @@
GetX509CertPtr(VALUE obj)
{
X509 *x509;
-
+
SafeGetX509(obj, x509);
-
+
return x509;
}
@@ -100,18 +100,18 @@
DupX509CertPtr(VALUE obj)
{
X509 *x509;
-
+
SafeGetX509(obj, x509);
-
+
CRYPTO_add(&x509->references, 1, CRYPTO_LOCK_X509);
-
+
return x509;
}
/*
* Private
*/
-static VALUE
+static VALUE
ossl_x509_alloc(VALUE klass)
{
X509 *x509;
@@ -130,7 +130,7 @@
* Certificate.new => cert
* Certificate.new(string) => cert
*/
-static VALUE
+static VALUE
ossl_x509_initialize(VALUE self, SEL sel, int argc, VALUE *argv)
{
BIO *in;
@@ -152,7 +152,7 @@
}
BIO_free(in);
if (!x509) ossl_raise(eX509CertError, NULL);
-
+
return self;
}
@@ -160,7 +160,7 @@
ossl_x509_copy(VALUE self, SEL sel, VALUE other)
{
X509 *a, *b, *x509;
-
+
rb_check_frozen(self);
if (self == other) return self;
@@ -169,7 +169,7 @@
x509 = X509_dup(b);
if (!x509) ossl_raise(eX509CertError, NULL);
-
+
DATA_PTR(self) = x509;
X509_free(a);
@@ -180,7 +180,7 @@
* call-seq:
* cert.to_der => string
*/
-static VALUE
+static VALUE
ossl_x509_to_der(VALUE self)
{
X509 *x509;
@@ -197,7 +197,7 @@
if (i2d_X509(x509, &p) <= 0)
ossl_raise(eX509CertError, NULL);
ossl_str_adjust(str, p);
-
+
return str;
}
@@ -205,13 +205,13 @@
* call-seq:
* cert.to_pem => string
*/
-static VALUE
+static VALUE
ossl_x509_to_pem(VALUE self)
{
X509 *x509;
BIO *out;
VALUE str;
-
+
GetX509(self, x509);
out = BIO_new(BIO_s_mem());
if (!out) ossl_raise(eX509CertError, NULL);
@@ -235,7 +235,7 @@
X509 *x509;
BIO *out;
VALUE str;
-
+
GetX509(self, x509);
out = BIO_new(BIO_s_mem());
@@ -254,7 +254,7 @@
/*
* Makes from X509 X509_REQuest
*/
-static VALUE
+static VALUE
ossl_x509_to_req(VALUE self)
{
X509 *x509;
@@ -276,13 +276,13 @@
* call-seq:
* cert.version => integer
*/
-static VALUE
+static VALUE
ossl_x509_get_version(VALUE self)
{
X509 *x509;
GetX509(self, x509);
-
+
return LONG2NUM(X509_get_version(x509));
}
@@ -290,7 +290,7 @@
* call-seq:
* cert.version = integer => integer
*/
-static VALUE
+static VALUE
ossl_x509_set_version(VALUE self, SEL sel, VALUE version)
{
X509 *x509;
@@ -311,13 +311,13 @@
* call-seq:
* cert.serial => integer
*/
-static VALUE
+static VALUE
ossl_x509_get_serial(VALUE self)
{
X509 *x509;
GetX509(self, x509);
-
+
return asn1integer_to_num(X509_get_serialNumber(x509));
}
@@ -325,7 +325,7 @@
* call-seq:
* cert.serial = integer => integer
*/
-static VALUE
+static VALUE
ossl_x509_set_serial(VALUE self, SEL sel, VALUE num)
{
X509 *x509;
@@ -334,7 +334,7 @@
x509->cert_info->serialNumber =
num_to_asn1integer(num, X509_get_serialNumber(x509));
-
+
return num;
}
@@ -342,7 +342,7 @@
* call-seq:
* cert.signature_algorithm => string
*/
-static VALUE
+static VALUE
ossl_x509_get_signature_algorithm(VALUE self)
{
X509 *x509;
@@ -366,12 +366,12 @@
* call-seq:
* cert.subject => name
*/
-static VALUE
+static VALUE
ossl_x509_get_subject(VALUE self)
{
X509 *x509;
X509_NAME *name;
-
+
GetX509(self, x509);
if (!(name = X509_get_subject_name(x509))) { /* NO DUP - don't free! */
ossl_raise(eX509CertError, NULL);
@@ -384,11 +384,11 @@
* call-seq:
* cert.subject = name => name
*/
-static VALUE
+static VALUE
ossl_x509_set_subject(VALUE self, SEL sel, VALUE subject)
{
X509 *x509;
-
+
GetX509(self, x509);
if (!X509_set_subject_name(x509, GetX509NamePtr(subject))) { /* DUPs name */
ossl_raise(eX509CertError, NULL);
@@ -401,7 +401,7 @@
* call-seq:
* cert.issuer => name
*/
-static VALUE
+static VALUE
ossl_x509_get_issuer(VALUE self)
{
X509 *x509;
@@ -419,7 +419,7 @@
* call-seq:
* cert.issuer = name => name
*/
-static VALUE
+static VALUE
ossl_x509_set_issuer(VALUE self, SEL sel, VALUE issuer)
{
X509 *x509;
@@ -436,7 +436,7 @@
* call-seq:
* cert.not_before => time
*/
-static VALUE
+static VALUE
ossl_x509_get_not_before(VALUE self)
{
X509 *x509;
@@ -454,12 +454,12 @@
* call-seq:
* cert.not_before = time => time
*/
-static VALUE
+static VALUE
ossl_x509_set_not_before(VALUE self, SEL sel, VALUE time)
{
X509 *x509;
time_t sec;
-
+
sec = time_to_time_t(time);
GetX509(self, x509);
if (!X509_time_adj(X509_get_notBefore(x509), 0, &sec)) {
@@ -473,7 +473,7 @@
* call-seq:
* cert.not_after => time
*/
-static VALUE
+static VALUE
ossl_x509_get_not_after(VALUE self)
{
X509 *x509;
@@ -491,12 +491,12 @@
* call-seq:
* cert.not_before = time => time
*/
-static VALUE
+static VALUE
ossl_x509_set_not_after(VALUE self, SEL sel, VALUE time)
{
X509 *x509;
time_t sec;
-
+
sec = time_to_time_t(time);
GetX509(self, x509);
if (!X509_time_adj(X509_get_notAfter(x509), 0, &sec)) {
@@ -510,7 +510,7 @@
* call-seq:
* cert.public_key => key
*/
-static VALUE
+static VALUE
ossl_x509_get_public_key(VALUE self)
{
X509 *x509;
@@ -528,7 +528,7 @@
* call-seq:
* cert.public_key = key => key
*/
-static VALUE
+static VALUE
ossl_x509_set_public_key(VALUE self, SEL sel, VALUE key)
{
X509 *x509;
@@ -545,7 +545,7 @@
* call-seq:
* cert.sign(key, digest) => self
*/
-static VALUE
+static VALUE
ossl_x509_sign(VALUE self, SEL sel, VALUE key, VALUE digest)
{
X509 *x509;
@@ -568,7 +568,7 @@
*
* Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
*/
-static VALUE
+static VALUE
ossl_x509_verify(VALUE self, SEL sel, VALUE key)
{
X509 *x509;
@@ -579,7 +579,7 @@
GetX509(self, x509);
if ((i = X509_verify(x509, pkey)) < 0) {
ossl_raise(eX509CertError, NULL);
- }
+ }
if (i > 0) {
return Qtrue;
}
@@ -593,12 +593,12 @@
*
* Checks if 'key' is PRIV key for this cert
*/
-static VALUE
+static VALUE
ossl_x509_check_private_key(VALUE self, SEL sel, VALUE key)
{
X509 *x509;
EVP_PKEY *pkey;
-
+
/* not needed private key, but should be */
pkey = GetPrivPKeyPtr(key); /* NO NEED TO DUP */
GetX509(self, x509);
@@ -614,7 +614,7 @@
* call-seq:
* cert.extensions => [extension...]
*/
-static VALUE
+static VALUE
ossl_x509_get_extensions(VALUE self)
{
X509 *x509;
@@ -640,13 +640,13 @@
* call-seq:
* cert.extensions = [ext...] => [ext...]
*/
-static VALUE
+static VALUE
ossl_x509_set_extensions(VALUE self, SEL sel, VALUE ary)
{
X509 *x509;
X509_EXTENSION *ext;
int i;
-
+
Check_Type(ary, T_ARRAY);
/* All ary's members should be X509Extension */
for (i=0; i<RARRAY_LEN(ary); i++) {
@@ -657,7 +657,7 @@
x509->cert_info->extensions = NULL;
for (i=0; i<RARRAY_LEN(ary); i++) {
ext = DupX509ExtPtr(RARRAY_PTR(ary)[i]);
-
+
if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
X509_EXTENSION_free(ext);
ossl_raise(eX509CertError, NULL);
@@ -672,12 +672,12 @@
* call-seq:
* cert.add_extension(extension) => extension
*/
-static VALUE
+static VALUE
ossl_x509_add_extension(VALUE self, SEL sel, VALUE extension)
{
X509 *x509;
X509_EXTENSION *ext;
-
+
GetX509(self, x509);
ext = DupX509ExtPtr(extension);
if (!X509_add_ext(x509, ext, -1)) { /* DUPs ext - FREE it */
@@ -726,17 +726,17 @@
/*
* INIT
*/
-void
+void
Init_ossl_x509cert()
{
eX509CertError = rb_define_class_under(mX509, "CertificateError", eOSSLError);
-
+
cX509Cert = rb_define_class_under(mX509, "Certificate", rb_cObject);
-
+
rb_objc_define_method(*(VALUE *)cX509Cert, "alloc", ossl_x509_alloc, 0);
rb_objc_define_method(cX509Cert, "initialize", ossl_x509_initialize, -1);
rb_define_copy_func(cX509Cert, ossl_x509_copy);
-
+
rb_objc_define_method(cX509Cert, "to_der", ossl_x509_to_der, 0);
rb_objc_define_method(cX509Cert, "to_pem", ossl_x509_to_pem, 0);
rb_define_alias(cX509Cert, "to_s", "to_pem");
Modified: MacRuby/trunk/ext/openssl/ossl_x509crl.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509crl.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509crl.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -66,14 +66,14 @@
tmp = crl ? X509_CRL_dup(crl) : X509_CRL_new();
if(!tmp) ossl_raise(eX509CRLError, NULL);
WrapX509CRL(cX509CRL, obj, tmp);
-
+
return obj;
}
/*
* PRIVATE
*/
-static VALUE
+static VALUE
ossl_x509crl_alloc(VALUE klass)
{
X509_CRL *crl;
@@ -87,7 +87,7 @@
return obj;
}
-static VALUE
+static VALUE
ossl_x509crl_initialize(VALUE self, SEL sel, int argc, VALUE *argv)
{
BIO *in;
@@ -116,7 +116,7 @@
ossl_x509crl_copy(VALUE self, SEL sel, VALUE other)
{
X509_CRL *a, *b, *crl;
-
+
rb_check_frozen(self);
if (self == other) return self;
GetX509CRL(self, a);
@@ -130,7 +130,7 @@
return self;
}
-static VALUE
+static VALUE
ossl_x509crl_get_version(VALUE self)
{
X509_CRL *crl;
@@ -142,7 +142,7 @@
return LONG2NUM(ver);
}
-static VALUE
+static VALUE
ossl_x509crl_set_version(VALUE self, SEL sel, VALUE version)
{
X509_CRL *crl;
@@ -159,7 +159,7 @@
return version;
}
-static VALUE
+static VALUE
ossl_x509crl_get_signature_algorithm(VALUE self)
{
X509_CRL *crl;
@@ -181,7 +181,7 @@
return str;
}
-static VALUE
+static VALUE
ossl_x509crl_get_issuer(VALUE self)
{
X509_CRL *crl;
@@ -191,7 +191,7 @@
return ossl_x509name_new(X509_CRL_get_issuer(crl)); /* NO DUP - don't free */
}
-static VALUE
+static VALUE
ossl_x509crl_set_issuer(VALUE self, SEL sel, VALUE issuer)
{
X509_CRL *crl;
@@ -204,7 +204,7 @@
return issuer;
}
-static VALUE
+static VALUE
ossl_x509crl_get_last_update(VALUE self)
{
X509_CRL *crl;
@@ -214,7 +214,7 @@
return asn1time_to_time(X509_CRL_get_lastUpdate(crl));
}
-static VALUE
+static VALUE
ossl_x509crl_set_last_update(VALUE self, SEL sel, VALUE time)
{
X509_CRL *crl;
@@ -229,7 +229,7 @@
return time;
}
-static VALUE
+static VALUE
ossl_x509crl_get_next_update(VALUE self)
{
X509_CRL *crl;
@@ -239,7 +239,7 @@
return asn1time_to_time(X509_CRL_get_nextUpdate(crl));
}
-static VALUE
+static VALUE
ossl_x509crl_set_next_update(VALUE self, SEL sel, VALUE time)
{
X509_CRL *crl;
@@ -280,7 +280,7 @@
return ary;
}
-static VALUE
+static VALUE
ossl_x509crl_set_revoked(VALUE self, SEL sel, VALUE ary)
{
X509_CRL *crl;
@@ -306,7 +306,7 @@
return ary;
}
-static VALUE
+static VALUE
ossl_x509crl_add_revoked(VALUE self, SEL sel, VALUE revoked)
{
X509_CRL *crl;
@@ -322,7 +322,7 @@
return revoked;
}
-static VALUE
+static VALUE
ossl_x509crl_sign(VALUE self, SEL sel, VALUE key, VALUE digest)
{
X509_CRL *crl;
@@ -339,7 +339,7 @@
return self;
}
-static VALUE
+static VALUE
ossl_x509crl_verify(VALUE self, SEL sel, VALUE key)
{
X509_CRL *crl;
@@ -356,7 +356,7 @@
return Qfalse;
}
-static VALUE
+static VALUE
ossl_x509crl_to_der(VALUE self)
{
X509_CRL *crl;
@@ -379,7 +379,7 @@
return str;
}
-static VALUE
+static VALUE
ossl_x509crl_to_pem(VALUE self)
{
X509_CRL *crl;
@@ -402,7 +402,7 @@
return str;
}
-static VALUE
+static VALUE
ossl_x509crl_to_text(VALUE self)
{
X509_CRL *crl;
@@ -421,14 +421,14 @@
BIO_get_mem_ptr(out, &buf);
str = rb_str_new(buf->data, buf->length);
BIO_free(out);
-
+
return str;
}
/*
* Gets X509v3 extensions as array of X509Ext objects
*/
-static VALUE
+static VALUE
ossl_x509crl_get_extensions(VALUE self)
{
X509_CRL *crl;
@@ -454,13 +454,13 @@
/*
* Sets X509_EXTENSIONs
*/
-static VALUE
+static VALUE
ossl_x509crl_set_extensions(VALUE self, SEL sel, VALUE ary)
{
X509_CRL *crl;
X509_EXTENSION *ext;
int i;
-
+
Check_Type(ary, T_ARRAY);
/* All ary members should be X509 Extensions */
for (i=0; i<RARRAY_LEN(ary); i++) {
@@ -481,7 +481,7 @@
return ary;
}
-static VALUE
+static VALUE
ossl_x509crl_add_extension(VALUE self, SEL sel, VALUE extension)
{
X509_CRL *crl;
@@ -501,17 +501,17 @@
/*
* INIT
*/
-void
+void
Init_ossl_x509crl()
{
eX509CRLError = rb_define_class_under(mX509, "CRLError", eOSSLError);
cX509CRL = rb_define_class_under(mX509, "CRL", rb_cObject);
-
+
rb_objc_define_method(*(VALUE *)cX509CRL, "alloc", ossl_x509crl_alloc, 0);
rb_objc_define_method(cX509CRL, "initialize", ossl_x509crl_initialize, -1);
rb_define_copy_func(cX509CRL, ossl_x509crl_copy);
-
+
rb_objc_define_method(cX509CRL, "version", ossl_x509crl_get_version, 0);
rb_objc_define_method(cX509CRL, "version=", ossl_x509crl_set_version, 1);
rb_objc_define_method(cX509CRL, "signature_algorithm", ossl_x509crl_get_signature_algorithm, 0);
Modified: MacRuby/trunk/ext/openssl/ossl_x509ext.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509ext.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509ext.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -49,7 +49,7 @@
/*
* Public
*/
-VALUE
+VALUE
ossl_x509ext_new(X509_EXTENSION *ext)
{
X509_EXTENSION *new;
@@ -64,7 +64,7 @@
ossl_raise(eX509ExtError, NULL);
}
WrapX509Ext(cX509Ext, obj, new);
-
+
return obj;
}
@@ -103,7 +103,7 @@
OPENSSL_free(ctx);
}
-static VALUE
+static VALUE
ossl_x509extfactory_alloc(VALUE klass)
{
X509V3_CTX *ctx;
@@ -115,7 +115,7 @@
return obj;
}
-static VALUE
+static VALUE
ossl_x509extfactory_set_issuer_cert(VALUE self, SEL sel, VALUE cert)
{
X509V3_CTX *ctx;
@@ -127,7 +127,7 @@
return cert;
}
-static VALUE
+static VALUE
ossl_x509extfactory_set_subject_cert(VALUE self, SEL sel, VALUE cert)
{
X509V3_CTX *ctx;
@@ -139,7 +139,7 @@
return cert;
}
-static VALUE
+static VALUE
ossl_x509extfactory_set_subject_req(VALUE self, SEL sel, VALUE req)
{
X509V3_CTX *ctx;
@@ -151,7 +151,7 @@
return req;
}
-static VALUE
+static VALUE
ossl_x509extfactory_set_crl(VALUE self, SEL sel, VALUE crl)
{
X509V3_CTX *ctx;
@@ -181,12 +181,12 @@
#define rb_f_fork rb_f_notimplement
#endif
-static VALUE
+static VALUE
ossl_x509extfactory_initialize(VALUE self, SEL sel, int argc, VALUE *argv)
{
/*X509V3_CTX *ctx;*/
VALUE issuer_cert, subject_cert, subject_req, crl;
-
+
/*GetX509ExtFactory(self, ctx);*/
rb_scan_args(argc, argv, "04",
@@ -211,7 +211,7 @@
* ["ln", "critical,value"] or the same for sn
* ["ln", "value"] => not critical
*/
-static VALUE
+static VALUE
ossl_x509extfactory_create_ext(VALUE self, SEL sel, int argc, VALUE *argv)
{
X509V3_CTX *ctx;
@@ -351,7 +351,7 @@
return flag;
}
-static VALUE
+static VALUE
ossl_x509ext_get_oid(VALUE obj)
{
X509_EXTENSION *ext;
@@ -428,12 +428,12 @@
Init_ossl_x509ext()
{
eX509ExtError = rb_define_class_under(mX509, "ExtensionError", eOSSLError);
-
+
cX509ExtFactory = rb_define_class_under(mX509, "ExtensionFactory", rb_cObject);
-
+
rb_objc_define_method(*(VALUE *)cX509ExtFactory, "alloc", ossl_x509extfactory_alloc, 0);
rb_objc_define_method(cX509ExtFactory, "initialize", ossl_x509extfactory_initialize, -1);
-
+
rb_attr(cX509ExtFactory, rb_intern("issuer_certificate"), 1, 0, Qfalse);
rb_attr(cX509ExtFactory, rb_intern("subject_certificate"), 1, 0, Qfalse);
rb_attr(cX509ExtFactory, rb_intern("subject_request"), 1, 0, Qfalse);
@@ -446,7 +446,7 @@
rb_objc_define_method(cX509ExtFactory, "crl=", ossl_x509extfactory_set_crl, 1);
rb_objc_define_method(cX509ExtFactory, "config=", ossl_x509extfactory_set_config, 1);
rb_objc_define_method(cX509ExtFactory, "create_ext", ossl_x509extfactory_create_ext, -1);
-
+
cX509Ext = rb_define_class_under(mX509, "Extension", rb_cObject);
rb_objc_define_method(*(VALUE *)cX509Ext, "alloc", ossl_x509ext_alloc, 0);
rb_objc_define_method(cX509Ext, "initialize", ossl_x509ext_initialize, -1);
Modified: MacRuby/trunk/ext/openssl/ossl_x509name.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509name.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509name.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -41,7 +41,7 @@
/*
* Public
*/
-VALUE
+VALUE
ossl_x509name_new(X509_NAME *name)
{
X509_NAME *new;
@@ -56,7 +56,7 @@
ossl_raise(eX509NameError, NULL);
}
WrapX509Name(cX509Name, obj, new);
-
+
return obj;
}
@@ -78,7 +78,7 @@
{
X509_NAME *name;
VALUE obj;
-
+
if (!(name = X509_NAME_new())) {
ossl_raise(eX509NameError, NULL);
}
@@ -222,7 +222,7 @@
* call-seq:
* name.to_a => [[name, data, type], ...]
*/
-static VALUE
+static VALUE
ossl_x509name_to_a(VALUE self)
{
X509_NAME *name;
@@ -231,7 +231,7 @@
char long_name[512];
const char *short_name;
VALUE ary, ret;
-
+
GetX509Name(self, name);
entries = X509_NAME_entry_count(name);
if (entries < 0) {
@@ -334,7 +334,7 @@
/*
* INIT
*/
-void
+void
Init_ossl_x509name()
{
VALUE utf8str, ptrstr, ia5str, hash;
Modified: MacRuby/trunk/ext/openssl/ossl_x509req.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509req.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509req.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -81,7 +81,7 @@
/*
* Private functions
*/
-static VALUE
+static VALUE
ossl_x509req_alloc(VALUE klass)
{
X509_REQ *req;
@@ -95,7 +95,7 @@
return obj;
}
-static VALUE
+static VALUE
ossl_x509req_initialize(VALUE self, SEL sel, int argc, VALUE *argv)
{
BIO *in;
@@ -124,7 +124,7 @@
ossl_x509req_copy(VALUE self, SEL sel, VALUE other)
{
X509_REQ *a, *b, *req;
-
+
rb_check_frozen(self);
if (self == other) return self;
GetX509Req(self, a);
@@ -138,14 +138,14 @@
return self;
}
-static VALUE
+static VALUE
ossl_x509req_to_pem(VALUE self)
{
X509_REQ *req;
BIO *out;
BUF_MEM *buf;
VALUE str;
-
+
GetX509Req(self, req);
if (!(out = BIO_new(BIO_s_mem()))) {
ossl_raise(eX509ReqError, NULL);
@@ -182,7 +182,7 @@
return str;
}
-static VALUE
+static VALUE
ossl_x509req_to_text(VALUE self)
{
X509_REQ *req;
@@ -209,12 +209,12 @@
/*
* Makes X509 from X509_REQuest
*/
-static VALUE
+static VALUE
ossl_x509req_to_x509(VALUE self, VALUE days, VALUE key)
{
X509_REQ *req;
X509 *x509;
-
+
GetX509Req(self, req);
...
if (!(x509 = X509_REQ_to_X509(req, d, pkey))) {
@@ -225,7 +225,7 @@
}
#endif
-static VALUE
+static VALUE
ossl_x509req_get_version(VALUE self)
{
X509_REQ *req;
@@ -237,7 +237,7 @@
return LONG2FIX(version);
}
-static VALUE
+static VALUE
ossl_x509req_set_version(VALUE self, SEL sel, VALUE version)
{
X509_REQ *req;
@@ -254,7 +254,7 @@
return version;
}
-static VALUE
+static VALUE
ossl_x509req_get_subject(VALUE self)
{
X509_REQ *req;
@@ -268,11 +268,11 @@
return ossl_x509name_new(name);
}
-static VALUE
+static VALUE
ossl_x509req_set_subject(VALUE self, SEL sel, VALUE subject)
{
X509_REQ *req;
-
+
GetX509Req(self, req);
/* DUPs name */
if (!X509_REQ_set_subject_name(req, GetX509NamePtr(subject))) {
@@ -282,7 +282,7 @@
return subject;
}
-static VALUE
+static VALUE
ossl_x509req_get_signature_algorithm(VALUE self)
{
X509_REQ *req;
@@ -291,7 +291,7 @@
VALUE str;
GetX509Req(self, req);
-
+
if (!(out = BIO_new(BIO_s_mem()))) {
ossl_raise(eX509ReqError, NULL);
}
@@ -305,7 +305,7 @@
return str;
}
-static VALUE
+static VALUE
ossl_x509req_get_public_key(VALUE self)
{
X509_REQ *req;
@@ -319,7 +319,7 @@
return ossl_pkey_new(pkey); /* NO DUP - OK */
}
-static VALUE
+static VALUE
ossl_x509req_set_public_key(VALUE self, SEL sel, VALUE key)
{
X509_REQ *req;
@@ -334,7 +334,7 @@
return key;
}
-static VALUE
+static VALUE
ossl_x509req_sign(VALUE self, SEL sel, VALUE key, VALUE digest)
{
X509_REQ *req;
@@ -354,7 +354,7 @@
/*
* Checks that cert signature is made with PRIVversion of this PUBLIC 'key'
*/
-static VALUE
+static VALUE
ossl_x509req_verify(VALUE self, SEL sel, VALUE key)
{
X509_REQ *req;
@@ -373,14 +373,14 @@
return Qfalse;
}
-static VALUE
+static VALUE
ossl_x509req_get_attributes(VALUE self)
{
X509_REQ *req;
int count, i;
X509_ATTRIBUTE *attr;
VALUE ary;
-
+
GetX509Req(self, req);
count = X509_REQ_get_attr_count(req);
@@ -397,7 +397,7 @@
return ary;
}
-static VALUE
+static VALUE
ossl_x509req_set_attributes(VALUE self, SEL sel, VALUE ary)
{
X509_REQ *req;
@@ -422,7 +422,7 @@
return ary;
}
-static VALUE
+static VALUE
ossl_x509req_add_attribute(VALUE self, SEL sel, VALUE attr)
{
X509_REQ *req;
@@ -438,17 +438,17 @@
/*
* X509_REQUEST init
*/
-void
+void
Init_ossl_x509req()
{
eX509ReqError = rb_define_class_under(mX509, "RequestError", eOSSLError);
-
+
cX509Req = rb_define_class_under(mX509, "Request", rb_cObject);
-
+
rb_objc_define_method(*(VALUE *)cX509Req, "alloc", ossl_x509req_alloc, 0);
rb_objc_define_method(cX509Req, "initialize", ossl_x509req_initialize, -1);
rb_define_copy_func(cX509Req, ossl_x509req_copy);
-
+
rb_objc_define_method(cX509Req, "to_pem", ossl_x509req_to_pem, 0);
rb_objc_define_method(cX509Req, "to_der", ossl_x509req_to_der, 0);
rb_define_alias(cX509Req, "to_s", "to_pem");
Modified: MacRuby/trunk/ext/openssl/ossl_x509revoked.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509revoked.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509revoked.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -36,7 +36,7 @@
/*
* PUBLIC
*/
-VALUE
+VALUE
ossl_x509revoked_new(X509_REVOKED *rev)
{
X509_REVOKED *new;
@@ -71,7 +71,7 @@
/*
* PRIVATE
*/
-static VALUE
+static VALUE
ossl_x509revoked_alloc(VALUE klass)
{
X509_REVOKED *rev;
@@ -85,14 +85,14 @@
return obj;
}
-static VALUE
+static VALUE
ossl_x509revoked_initialize(int argc, VALUE *argv, VALUE self)
{
/* EMPTY */
return self;
}
-static VALUE
+static VALUE
ossl_x509revoked_get_serial(VALUE self)
{
X509_REVOKED *rev;
@@ -102,7 +102,7 @@
return asn1integer_to_num(rev->serialNumber);
}
-static VALUE
+static VALUE
ossl_x509revoked_set_serial(VALUE self, VALUE num)
{
X509_REVOKED *rev;
@@ -113,17 +113,17 @@
return num;
}
-static VALUE
+static VALUE
ossl_x509revoked_get_time(VALUE self)
{
X509_REVOKED *rev;
-
+
GetX509Rev(self, rev);
return asn1time_to_time(rev->revocationDate);
}
-static VALUE
+static VALUE
ossl_x509revoked_set_time(VALUE self, VALUE time)
{
X509_REVOKED *rev;
@@ -140,7 +140,7 @@
/*
* Gets X509v3 extensions as array of X509Ext objects
*/
-static VALUE
+static VALUE
ossl_x509revoked_get_extensions(VALUE self)
{
X509_REVOKED *rev;
@@ -166,7 +166,7 @@
/*
* Sets X509_EXTENSIONs
*/
-static VALUE
+static VALUE
ossl_x509revoked_set_extensions(VALUE self, VALUE ary)
{
X509_REVOKED *rev;
@@ -196,7 +196,7 @@
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);
@@ -214,10 +214,10 @@
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);
Modified: MacRuby/trunk/ext/openssl/ossl_x509store.c
===================================================================
--- MacRuby/trunk/ext/openssl/ossl_x509store.c 2010-12-28 03:04:36 UTC (rev 5089)
+++ MacRuby/trunk/ext/openssl/ossl_x509store.c 2010-12-28 09:03:56 UTC (rev 5090)
@@ -54,7 +54,7 @@
/*
* Public functions
*/
-VALUE
+VALUE
ossl_x509store_new(X509_STORE *store)
{
VALUE obj;
@@ -76,19 +76,19 @@
X509_STORE *
DupX509StorePtr(VALUE obj)
-{
+{
X509_STORE *store;
SafeGetX509Store(obj, store);
CRYPTO_add(&store->references, 1, CRYPTO_LOCK_X509_STORE);
-
+
return store;
}
/*
* Private functions
*/
-static VALUE
+static VALUE
ossl_x509store_alloc(VALUE klass)
{
X509_STORE *store;
@@ -170,7 +170,7 @@
#if (OPENSSL_VERSION_NUMBER >= 0x00907000L)
X509_STORE *store;
long p = NUM2LONG(purpose);
-
+
GetX509Store(self, store);
X509_STORE_set_purpose(store, p);
#else
@@ -196,14 +196,14 @@
return trust;
}
-static VALUE
+static VALUE
ossl_x509store_set_time(VALUE self, SEL sel, VALUE time)
{
rb_iv_set(self, "@time", time);
return time;
}
-static VALUE
+static VALUE
ossl_x509store_add_file(VALUE self, SEL sel, VALUE file)
{
X509_STORE *store;
@@ -224,7 +224,7 @@
return self;
}
-static VALUE
+static VALUE
ossl_x509store_add_path(VALUE self, SEL sel, VALUE dir)
{
X509_STORE *store;
@@ -292,7 +292,7 @@
static VALUE ossl_x509stctx_get_err_string(VALUE);
static VALUE ossl_x509stctx_get_chain(VALUE);
-static VALUE
+static VALUE
ossl_x509store_verify(VALUE self, SEL sel, int argc, VALUE *argv)
{
VALUE cert, chain;
@@ -349,7 +349,7 @@
X509_STORE_CTX_free(ctx);
}
-static VALUE
+static VALUE
ossl_x509stctx_alloc(VALUE klass)
{
X509_STORE_CTX *ctx;
@@ -441,7 +441,7 @@
return ary;
}
-static VALUE
+static VALUE
ossl_x509stctx_get_err(VALUE self)
{
X509_STORE_CTX *ctx;
@@ -462,7 +462,7 @@
return err;
}
-static VALUE
+static VALUE
ossl_x509stctx_get_err_string(VALUE self)
{
X509_STORE_CTX *ctx;
@@ -474,7 +474,7 @@
return rb_str_new2(X509_verify_cert_error_string(err));
}
-static VALUE
+static VALUE
ossl_x509stctx_get_err_depth(VALUE self)
{
X509_STORE_CTX *ctx;
@@ -484,7 +484,7 @@
return INT2FIX(X509_STORE_CTX_get_error_depth(ctx));
}
-static VALUE
+static VALUE
ossl_x509stctx_get_curr_cert(VALUE self)
{
X509_STORE_CTX *ctx;
@@ -576,7 +576,7 @@
/*
* INIT
*/
-void
+void
Init_ossl_x509store()
{
VALUE x509stctx;
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101228/c797f91e/attachment-0001.html>
More information about the macruby-changes
mailing list