diff options
author | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-06-12 19:54:54 +0000 |
---|---|---|
committer | Michal Rokos <m.rokos@sh.cvut.cz> | 2002-06-12 19:54:54 +0000 |
commit | 76973b1d70652c1c9686c8468db2d67f4bd92bce (patch) | |
tree | b8a43d1ea02b4f6efecc3700f3da6ea3f28ad50c /ossl_ns_spki.c | |
parent | 8165260d7d9c752ac12400bece94d2c7d7eab1af (diff) | |
download | ruby-openssl-history-76973b1d70652c1c9686c8468db2d67f4bd92bce.tar.gz |
Just some indent...
Diffstat (limited to 'ossl_ns_spki.c')
-rw-r--r-- | ossl_ns_spki.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/ossl_ns_spki.c b/ossl_ns_spki.c index d4cc129..005952e 100644 --- a/ossl_ns_spki.c +++ b/ossl_ns_spki.c @@ -45,8 +45,7 @@ ossl_spki_s_allocate(VALUE klass) if (!(spki = NETSCAPE_SPKI_new())) { ossl_raise(eSPKIError, ""); - } - + } WrapSPKI(klass, obj, spki); return obj; @@ -61,11 +60,9 @@ ossl_spki_initialize(int argc, VALUE *argv, VALUE self) if (rb_scan_args(argc, argv, "01", &buffer) == 0) { return self; } - if (!(spki = NETSCAPE_SPKI_b64_decode(StringValuePtr(buffer), -1))) { ossl_raise(eSPKIError, ""); } - NETSCAPE_SPKI_free(DATA_PTR(self)); DATA_PTR(self) = spki; @@ -84,7 +81,6 @@ ossl_spki_to_pem(VALUE self) if (!(data = NETSCAPE_SPKI_b64_encode(spki))) { ossl_raise(eSPKIError, ""); } - str = rb_str_new2(data); OPENSSL_free(data); @@ -152,9 +148,9 @@ ossl_spki_get_challenge(VALUE self) GetSPKI(self, spki); - if (spki->spkac->challenge->length > 0) + if (spki->spkac->challenge->length > 0) { return rb_str_new(spki->spkac->challenge->data, spki->spkac->challenge->length); - + } return rb_str_new2(""); } @@ -170,7 +166,6 @@ ossl_spki_set_challenge(VALUE self, VALUE str) if (!ASN1_STRING_set(spki->spkac->challenge, RSTRING(str)->ptr, RSTRING(str)->len)) { ossl_raise(eSPKIError, ""); } - return str; } @@ -206,9 +201,7 @@ ossl_spki_verify(VALUE self, VALUE key) pkey = GetPKeyPtr(key); /* NO NEED TO DUP */ - result = NETSCAPE_SPKI_verify(spki, pkey); - - if (result < 0) { + if ((result = NETSCAPE_SPKI_verify(spki, pkey)) < 0) { ossl_raise(eSPKIError, ""); } if (result > 0) { |