From 198c2570e740280bf7f00a38d311ade19c27fef7 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 30 Jun 2011 20:20:32 +0000 Subject: * sytle fixes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/openssl/ossl_asn1.c | 4 ++-- ext/openssl/ossl_pkcs7.c | 2 +- ext/openssl/ossl_pkey.c | 2 +- ext/openssl/ossl_pkey_dh.c | 6 +++--- ext/openssl/ossl_pkey_dsa.c | 2 +- ext/openssl/ossl_ssl.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'ext/openssl') diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c index 0de80a32a9..3f50933aa4 100644 --- a/ext/openssl/ossl_asn1.c +++ b/ext/openssl/ossl_asn1.c @@ -206,7 +206,7 @@ static ID sivVALUE, sivTAG, sivTAG_CLASS, sivTAGGING, sivINFINITE_LENGTH, sivUNU * for infinite length values is different in OpenSSL <= 0.9.7 */ #if OPENSSL_VERSION_NUMBER < 0x00908000L -#define ossl_asn1_object_size(cons, len, tag) (cons) == 2 ? (len) + ASN1_object_size((cons), 0, (tag)) : ASN1_object_size((cons), (len), (tag)) +#define ossl_asn1_object_size(cons, len, tag) (cons) == 2 ? (len) + ASN1_object_size((cons), 0, (tag)) : ASN1_object_size((cons), (len), (tag)) #define ossl_asn1_put_object(pp, cons, len, tag, xc) (cons) == 2 ? ASN1_put_object((pp), (cons), 0, (tag), (xc)) : ASN1_put_object((pp), (cons), (len), (tag), (xc)) #else #define ossl_asn1_object_size(cons, len, tag) ASN1_object_size((cons), (len), (tag)) @@ -1832,7 +1832,7 @@ Init_ossl_asn1() * OpenSSL::ASN1::EndOfContent instance. * * Please note that it is not possible to encode Constructive without - * the +infinite_length+ attribute being set to +true+, use + * the +infinite_length+ attribute being set to +true+, use * OpenSSL::ASN1::Sequence or OpenSSL::ASN1::Set in these cases instead. * * === Example - Infinite length OCTET STRING diff --git a/ext/openssl/ossl_pkcs7.c b/ext/openssl/ossl_pkcs7.c index 889071c265..f59d3c71d9 100644 --- a/ext/openssl/ossl_pkcs7.c +++ b/ext/openssl/ossl_pkcs7.c @@ -322,7 +322,7 @@ ossl_pkcs7_initialize(int argc, VALUE *argv, VALUE self) if (!p7) { OSSL_BIO_reset(in); p7 = d2i_PKCS7_bio(in, &pkcs); - if (!p7) + if (!p7) ossl_raise(rb_eArgError, "Could not parse the PKCS7"); DATA_PTR(self) = pkcs; } diff --git a/ext/openssl/ossl_pkey.c b/ext/openssl/ossl_pkey.c index c237a1ec83..43812daa9c 100644 --- a/ext/openssl/ossl_pkey.c +++ b/ext/openssl/ossl_pkey.c @@ -98,7 +98,7 @@ ossl_pkey_new_from_file(VALUE filename) * * +pwd+ is an optional password in case +string+ or +file+ is an encrypted * PEM resource. */ -static VALUE +static VALUE ossl_pkey_new_from_data(int argc, VALUE *argv, VALUE self) { FILE *fp; diff --git a/ext/openssl/ossl_pkey_dh.c b/ext/openssl/ossl_pkey_dh.c index dd56458232..748d9c82fd 100644 --- a/ext/openssl/ossl_pkey_dh.c +++ b/ext/openssl/ossl_pkey_dh.c @@ -357,7 +357,7 @@ ossl_dh_to_text(VALUE self) * per-session information. * * === Example - * dh = OpenSSL::PKey::DH.new(2048) # has public and private key set + * dh = OpenSSL::PKey::DH.new(2048) # has public and private key set * public_key = dh.public_key # contains only prime and generator * parameters = public_key.to_der # it's safe to publish this */ @@ -574,10 +574,10 @@ Init_ossl_dh() * dh1 = OpenSSL::PKey::DH.new(2048) * params = dh1.public_key.to_der #you may send this publicly to the participating party * dh2 = OpenSSL::PKey::DH.new(der) - * dh2.generate_key! #generate the per-session key pair + * dh2.generate_key! #generate the per-session key pair * symm_key1 = dh1.compute_key(dh2.pub_key) * symm_key2 = dh2.compute_key(dh1.pub_key) - * + * * puts symm_key1 == symm_key2 # => true */ cDH = rb_define_class_under(mPKey, "DH", cPKey); diff --git a/ext/openssl/ossl_pkey_dsa.c b/ext/openssl/ossl_pkey_dsa.c index 79adeeea38..6b10e8fdf8 100644 --- a/ext/openssl/ossl_pkey_dsa.c +++ b/ext/openssl/ossl_pkey_dsa.c @@ -515,7 +515,7 @@ Init_ossl_dsa() /* Document-class: OpenSSL::PKey::DSA * - * DSA, the Digital Signature Algorithm, is specified in NIST's + * DSA, the Digital Signature Algorithm, is specified in NIST's * FIPS 186-3. It is an asymmetric public key algorithm that may be used * similar to e.g. RSA. * Please note that for OpenSSL versions prior to 1.0.0 the digest diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c index c18435e35e..4d878797d4 100644 --- a/ext/openssl/ossl_ssl.c +++ b/ext/openssl/ossl_ssl.c @@ -1647,7 +1647,7 @@ ossl_ssl_get_verify_result(VALUE self) * call-seq: * ssl.client_ca => [x509name, ...] * - * Returns the list of client CAs. Please note that in contrast to + * Returns the list of client CAs. Please note that in contrast to * SSLContext#client_ca= no array of X509::Certificate is returned but * X509::Name instances of the CA's subject distinguished name. * -- cgit v1.2.3