summaryrefslogtreecommitdiff
path: root/ext/openssl
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-04 00:57:31 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-09-04 00:57:31 +0000
commitaf6c038b23c056fed1a8f5cbb8827b3a5061e893 (patch)
tree466054a5bb7f4266459645f489c731a2bd3c4b90 /ext/openssl
parent4bb125f91a1df7d5252b1dd1f59c1ce0238e0192 (diff)
remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/openssl')
-rw-r--r--ext/openssl/lib/openssl/bn.rb6
-rw-r--r--ext/openssl/lib/openssl/cipher.rb6
-rw-r--r--ext/openssl/lib/openssl/digest.rb6
-rw-r--r--ext/openssl/lib/openssl/x509.rb6
-rw-r--r--ext/openssl/ossl.c14
-rw-r--r--ext/openssl/ossl_asn1.c4
-rw-r--r--ext/openssl/ossl_ssl.c18
7 files changed, 30 insertions, 30 deletions
diff --git a/ext/openssl/lib/openssl/bn.rb b/ext/openssl/lib/openssl/bn.rb
index b2fca16..180de18 100644
--- a/ext/openssl/lib/openssl/bn.rb
+++ b/ext/openssl/lib/openssl/bn.rb
@@ -3,16 +3,16 @@
# $RCSfile$
#
# = Ruby-space definitions that completes C-space funcs for BN
-#
+#
# = Info
# 'OpenSSL for Ruby 2' project
# Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
# All rights reserved.
-#
+#
# = Licence
# This program is licenced under the same licence as Ruby.
# (See the file 'LICENCE'.)
-#
+#
# = Version
# $Id$
#
diff --git a/ext/openssl/lib/openssl/cipher.rb b/ext/openssl/lib/openssl/cipher.rb
index eb146fb..b3340ff 100644
--- a/ext/openssl/lib/openssl/cipher.rb
+++ b/ext/openssl/lib/openssl/cipher.rb
@@ -3,16 +3,16 @@
# $RCSfile$
#
# = Ruby-space predefined Cipher subclasses
-#
+#
# = Info
# 'OpenSSL for Ruby 2' project
# Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
# All rights reserved.
-#
+#
# = Licence
# This program is licenced under the same licence as Ruby.
# (See the file 'LICENCE'.)
-#
+#
# = Version
# $Id$
#
diff --git a/ext/openssl/lib/openssl/digest.rb b/ext/openssl/lib/openssl/digest.rb
index 43c9974..1a6108d 100644
--- a/ext/openssl/lib/openssl/digest.rb
+++ b/ext/openssl/lib/openssl/digest.rb
@@ -3,16 +3,16 @@
# $RCSfile$
#
# = Ruby-space predefined Digest subclasses
-#
+#
# = Info
# 'OpenSSL for Ruby 2' project
# Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
# All rights reserved.
-#
+#
# = Licence
# This program is licenced under the same licence as Ruby.
# (See the file 'LICENCE'.)
-#
+#
# = Version
# $Id$
#
diff --git a/ext/openssl/lib/openssl/x509.rb b/ext/openssl/lib/openssl/x509.rb
index f57f676..31a4381 100644
--- a/ext/openssl/lib/openssl/x509.rb
+++ b/ext/openssl/lib/openssl/x509.rb
@@ -3,16 +3,16 @@
# $RCSfile$
#
# = Ruby-space definitions that completes C-space funcs for X509 and subclasses
-#
+#
# = Info
# 'OpenSSL for Ruby 2' project
# Copyright (C) 2002 Michal Rokos <m.rokos@sh.cvut.cz>
# All rights reserved.
-#
+#
# = Licence
# This program is licenced under the same licence as Ruby.
# (See the file 'LICENCE'.)
-#
+#
# = Version
# $Id$
#
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index 989e914..ac8f638 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -497,9 +497,9 @@ ossl_debug_set(VALUE self, VALUE val)
*
* Asymmetric public/private key encryption is slow and victim to attack in
* cases where it is used without padding or directly to encrypt larger chunks
- * of data. Typical use cases for RSA encryption involve "wrapping" a symmetric
+ * of data. Typical use cases for RSA encryption involve "wrapping" a symmetric
* key with the public key of the recipient who would "unwrap" that symmetric
- * key again using their private key.
+ * key again using their private key.
* The following illustrates a simplified example of such a key transport
* scheme. It shouldn't be used in practice, though, standardized protocols
* should always be preferred.
@@ -519,7 +519,7 @@ ossl_debug_set(VALUE self, VALUE val)
* Using "private_encrypt" to encrypt some data with the private key is
* equivalent to applying a digital signature to the data. A verifying
* party may validate the signature by comparing the result of decrypting
- * the signature with "public_decrypt" to the original data. However,
+ * the signature with "public_decrypt" to the original data. However,
* OpenSSL::PKey already has methods "sign" and "verify" that handle
* digital signatures in a standardized way - "private_encrypt" and
* "public_decrypt" shouldn't be used in practice.
@@ -543,20 +543,20 @@ ossl_debug_set(VALUE self, VALUE val)
* end
*
* == PBKDF2 Password-based Encryption
- *
+ *
* If supported by the underlying OpenSSL version used, Password-based
* Encryption should use the features of PKCS5. If not supported or if
* required by legacy applications, the older, less secure methods specified
* in RFC 2898 are also supported (see below).
- *
- * PKCS5 supports PBKDF2 as it was specified in PKCS#5
+ *
+ * PKCS5 supports PBKDF2 as it was specified in PKCS#5
* v2.0[http://www.rsa.com/rsalabs/node.asp?id=2127]. It still uses a
* password, a salt, and additionally a number of iterations that will
* slow the key derivation process down. The slower this is, the more work
* it requires being able to brute-force the resulting key.
*
* === Encryption
- *
+ *
* The strategy is to first instantiate a Cipher for encryption, and
* then to generate a random IV plus a key derived from the password
* using PBKDF2. PKCS #5 v2.0 recommends at least 8 bytes for the salt,
diff --git a/ext/openssl/ossl_asn1.c b/ext/openssl/ossl_asn1.c
index 18329be..8188151 100644
--- a/ext/openssl/ossl_asn1.c
+++ b/ext/openssl/ossl_asn1.c
@@ -150,8 +150,8 @@ ASN1_INTEGER *
num_to_asn1integer(VALUE obj, ASN1_INTEGER *ai)
{
BIGNUM *bn;
-
- if (NIL_P(obj))
+
+ if (NIL_P(obj))
ossl_raise(rb_eTypeError, "Can't convert nil into Integer");
bn = GetBNPtr(obj);
diff --git a/ext/openssl/ossl_ssl.c b/ext/openssl/ossl_ssl.c
index cc84ad1..86ec206 100644
--- a/ext/openssl/ossl_ssl.c
+++ b/ext/openssl/ossl_ssl.c
@@ -586,7 +586,7 @@ ssl_npn_encode_protocols(VALUE sslctx, VALUE protocols)
}
static int
-ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg)
+ssl_npn_advertise_cb(SSL *ssl, const unsigned char **out, unsigned int *outlen, void *arg)
{
VALUE sslctx_obj = (VALUE) arg;
VALUE protocols = rb_iv_get(sslctx_obj, "@_protocols");
@@ -602,7 +602,7 @@ ssl_npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsi
{
int i = 0;
VALUE sslctx_obj, cb, protocols, selected;
-
+
sslctx_obj = (VALUE) arg;
cb = rb_iv_get(sslctx_obj, "@npn_select_cb");
protocols = rb_ary_new();
@@ -623,14 +623,14 @@ ssl_npn_select_cb(SSL *s, unsigned char **out, unsigned char *outlen, const unsi
}
#endif
-/* This function may serve as the entry point to support further
+/* This function may serve as the entry point to support further
* callbacks. */
static void
ssl_info_cb(const SSL *ssl, int where, int val)
{
int state = SSL_state(ssl);
- if ((where & SSL_CB_HANDSHAKE_START) &&
+ if ((where & SSL_CB_HANDSHAKE_START) &&
(state & SSL_ST_ACCEPT)) {
ssl_renegotiation_cb(ssl);
}
@@ -1801,7 +1801,7 @@ ossl_ssl_npn_protocol(VALUE self)
unsigned int outlen;
ossl_ssl_data_get_struct(self, ssl);
-
+
SSL_get0_next_proto_negotiated(ssl, &out, &outlen);
if (!outlen)
return Qnil;
@@ -1836,7 +1836,7 @@ Init_ossl_ssl()
* connection. Both client and server TLS connections are supported,
* SSLSocket and SSLServer may be used in conjunction with an instance
* of SSLContext to set up connections.
- */
+ */
mSSL = rb_define_module_under(mOSSL, "SSL");
/* Document-class: OpenSSL::SSL::SSLError
*
@@ -2010,7 +2010,7 @@ Init_ossl_ssl()
* and to cancel the process, an Error may be raised within the callback.
*
* === Disable client renegotiation
- *
+ *
* When running a server, it is often desirable to disable client
* renegotiation entirely. You may use a callback as follows to implement
* this feature:
@@ -2019,7 +2019,7 @@ Init_ossl_ssl()
* ctx.renegotiation_cb = lambda do |ssl|
* num_handshakes += 1
* raise RuntimeError.new("Client renegotiation disabled") if num_handshakes > 1
- * end
+ * end
*/
rb_attr(cSSLContext, rb_intern("renegotiation_cb"), 1, 1, Qfalse);
#ifdef HAVE_OPENSSL_NPN_NEGOTIATED
@@ -2042,7 +2042,7 @@ Init_ossl_ssl()
* the server. If none is acceptable, raising an error in the callback
* will cause the handshake to fail. Not setting this callback explicitly
* means not supporting the NPN extension on the client - any protocols
- * advertised by the server will be ignored.
+ * advertised by the server will be ignored.
*
* === Example
*