mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
remove trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36895 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
4bb125f91a
commit
af6c038b23
14 changed files with 57 additions and 57 deletions
|
@ -2789,7 +2789,7 @@ Init_curses(void)
|
|||
RUBY_EXTERN char *curses_version;
|
||||
version = rb_sprintf("curses (%s)", curses_version);
|
||||
#else
|
||||
/* BSD curses, perhaps. NetBSD 5 still use it. */
|
||||
/* BSD curses, perhaps. NetBSD 5 still use it. */
|
||||
version = rb_str_new2("curses (unknown)");
|
||||
#endif
|
||||
/*
|
||||
|
|
|
@ -1126,7 +1126,7 @@ Init_dbm(void)
|
|||
* - "Berkeley DB (unknown)" (4.4BSD, maybe)
|
||||
* - "GDBM version 1.8.3. 10/15/2002 (built Jul 1 2011 12:32:45)"
|
||||
* - "QDBM 1.8.78"
|
||||
*
|
||||
*
|
||||
*/
|
||||
rb_define_const(rb_cDBM, "VERSION", version);
|
||||
}
|
||||
|
|
|
@ -148,7 +148,7 @@ def headers.db_check2(db, hdr)
|
|||
end
|
||||
|
||||
# Berkeley DB's ndbm.h (since 1.85 at least) defines DBM_SUFFIX.
|
||||
# Note that _DB_H_ is not defined on Mac OS X because
|
||||
# Note that _DB_H_ is not defined on Mac OS X because
|
||||
# it uses Berkeley DB 1 but ndbm.h doesn't include db.h.
|
||||
have_db_header = have_macro('DBM_SUFFIX', hdr, hsearch)
|
||||
|
||||
|
@ -200,7 +200,7 @@ def headers.db_check2(db, hdr)
|
|||
if /\Agdbm/ !~ db && have_gdbm_header
|
||||
return false
|
||||
end
|
||||
|
||||
|
||||
if have_ndbm_header
|
||||
return false
|
||||
end
|
||||
|
|
|
@ -98,7 +98,7 @@ module DL
|
|||
last_offset = offset
|
||||
|
||||
align = PackInfo::ALIGN_MAP[type]
|
||||
offset = PackInfo.align(last_offset, align) +
|
||||
offset = PackInfo.align(last_offset, align) +
|
||||
(PackInfo::SIZE_MAP[type] * count)
|
||||
|
||||
align
|
||||
|
|
|
@ -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$
|
||||
#
|
||||
|
|
|
@ -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$
|
||||
#
|
||||
|
|
|
@ -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$
|
||||
#
|
||||
|
|
|
@ -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$
|
||||
#
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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
|
||||
*
|
||||
|
|
|
@ -495,7 +495,7 @@ readline_s_set_output(VALUE self, VALUE output)
|
|||
* characters.
|
||||
*
|
||||
* See GNU Readline's rl_pre_input_hook variable.
|
||||
*
|
||||
*
|
||||
* Raises ArgumentError if +proc+ does not respond to the call method.
|
||||
*
|
||||
* Raises SecurityError if $SAFE is 4.
|
||||
|
|
|
@ -130,7 +130,7 @@ end
|
|||
# A photo is an image whose pixels can display any color or be transparent.
|
||||
# At present, only GIF and PPM/PGM formats are supported, but an interface
|
||||
# exists to allow additional image file formats to be added easily.
|
||||
#
|
||||
#
|
||||
# This class documentation is a copy from the original Tcl/Tk at
|
||||
# http://www.tcl.tk/man/tcl8.5/TkCmd/photo.htm with some rewrited parts.
|
||||
class TkPhotoImage<TkImage
|
||||
|
@ -162,13 +162,13 @@ class TkPhotoImage<TkImage
|
|||
# image = TkPhotoImage.new(:file: => 'my_image.gif')
|
||||
#
|
||||
# == Options
|
||||
# Photos support the following options:
|
||||
# Photos support the following options:
|
||||
# * :data
|
||||
# Specifies the contents of the image as a string.
|
||||
# * :format
|
||||
# Specifies the name of the file format for the data.
|
||||
# * :file
|
||||
# Gives the name of a file that is to be read to supply data for the image.
|
||||
# Gives the name of a file that is to be read to supply data for the image.
|
||||
# * :gamma
|
||||
# Specifies that the colors allocated for displaying this image in a window
|
||||
# should be corrected for a non-linear display with the specified gamma
|
||||
|
@ -185,7 +185,7 @@ class TkPhotoImage<TkImage
|
|||
# Specifies the width of the image, in pixels. This option is useful
|
||||
# primarily in situations where the user wishes to build up the contents of
|
||||
# the image piece by piece. A value of zero (the default) allows the image
|
||||
# to expand or shrink horizontally to fit the data stored in it.
|
||||
# to expand or shrink horizontally to fit the data stored in it.
|
||||
def initialize(*args)
|
||||
@type = 'photo'
|
||||
super(*args)
|
||||
|
@ -193,7 +193,7 @@ class TkPhotoImage<TkImage
|
|||
|
||||
# Blank the image; that is, set the entire image to have no data, so it will
|
||||
# be displayed as transparent, and the background of whatever window it is
|
||||
# displayed in will show through.
|
||||
# displayed in will show through.
|
||||
def blank
|
||||
tk_send_without_enc('blank')
|
||||
self
|
||||
|
@ -233,7 +233,7 @@ class TkPhotoImage<TkImage
|
|||
# destination, possibly with pixel zooming and/or subsampling. If no options
|
||||
# are specified, this method copies the whole of source into destination,
|
||||
# starting at coordinates (0,0) in destination. The following options may be
|
||||
# specified:
|
||||
# specified:
|
||||
#
|
||||
# * :from [x1, y1, x2, y2]
|
||||
# Specifies a rectangular sub-region of the source image to be copied.
|
||||
|
@ -250,30 +250,30 @@ class TkPhotoImage<TkImage
|
|||
# specified). If x2 and y2 are specified, the source region will be
|
||||
# replicated if necessary to fill the destination region in a tiled fashion.
|
||||
# * :shrink
|
||||
# Specifies that the size of the destination image should be reduced, if
|
||||
# necessary, so that the region being copied into is at the bottom-right
|
||||
# corner of the image. This option will not affect the width or height of
|
||||
# Specifies that the size of the destination image should be reduced, if
|
||||
# necessary, so that the region being copied into is at the bottom-right
|
||||
# corner of the image. This option will not affect the width or height of
|
||||
# the image if the user has specified a non-zero value for the :width or
|
||||
# :height configuration option, respectively.
|
||||
# * :zoom [x, y]
|
||||
# Specifies that the source region should be magnified by a factor of x
|
||||
# Specifies that the source region should be magnified by a factor of x
|
||||
# in the X direction and y in the Y direction. If y is not given, the
|
||||
# default value is the same as x. With this option, each pixel in the
|
||||
# source image will be expanded into a block of x x y pixels in the
|
||||
# destination image, all the same color. x and y must be greater than 0.
|
||||
# * :subsample [x, y]
|
||||
# Specifies that the source image should be reduced in size by using only
|
||||
# every xth pixel in the X direction and yth pixel in the Y direction.
|
||||
# Negative values will cause the image to be flipped about the Y or X axes,
|
||||
# every xth pixel in the X direction and yth pixel in the Y direction.
|
||||
# Negative values will cause the image to be flipped about the Y or X axes,
|
||||
# respectively. If y is not given, the default value is the same as x.
|
||||
# * :compositingrule rule
|
||||
# Specifies how transparent pixels in the source image are combined with
|
||||
# Specifies how transparent pixels in the source image are combined with
|
||||
# the destination image. When a compositing rule of <tt>overlay</tt> is set,
|
||||
# the old contents of the destination image are visible, as if the source
|
||||
# image were printed on a piece of transparent film and placed over the
|
||||
# top of the destination. When a compositing rule of <tt>set</tt> is set,
|
||||
# the old contents of the destination image are discarded and the source
|
||||
# image is used as-is. The default compositing rule is <tt>overlay</tt>.
|
||||
# image is used as-is. The default compositing rule is <tt>overlay</tt>.
|
||||
def copy(src, *opts)
|
||||
if opts.size == 0
|
||||
tk_send('copy', src)
|
||||
|
@ -314,14 +314,14 @@ class TkPhotoImage<TkImage
|
|||
# whole image.
|
||||
# * :grayscale
|
||||
# If this options is specified, the data will not contain color information.
|
||||
# All pixel data will be transformed into grayscale.
|
||||
# All pixel data will be transformed into grayscale.
|
||||
def data(keys={})
|
||||
tk_split_list(tk_send('data', *_photo_hash_kv(keys)))
|
||||
end
|
||||
|
||||
# Returns the color of the pixel at coordinates (x,y) in the image as a list
|
||||
# Returns the color of the pixel at coordinates (x,y) in the image as a list
|
||||
# of three integers between 0 and 255, representing the red, green and blue
|
||||
# components respectively.
|
||||
# components respectively.
|
||||
def get(x, y)
|
||||
tk_send('get', x, y).split.collect{|n| n.to_i}
|
||||
end
|
||||
|
@ -362,13 +362,13 @@ class TkPhotoImage<TkImage
|
|||
self
|
||||
end
|
||||
|
||||
# Returns a boolean indicating if the pixel at (x,y) is transparent.
|
||||
# Returns a boolean indicating if the pixel at (x,y) is transparent.
|
||||
def get_transparency(x, y)
|
||||
bool(tk_send('transparency', 'get', x, y))
|
||||
end
|
||||
|
||||
|
||||
# Makes the pixel at (x,y) transparent if <tt>state</tt> is true, and makes
|
||||
# that pixel opaque otherwise.
|
||||
# that pixel opaque otherwise.
|
||||
def set_transparency(x, y, state)
|
||||
tk_send('transparency', 'set', x, y, state)
|
||||
self
|
||||
|
|
|
@ -1830,7 +1830,7 @@ rb_inflate_s_allocate(VALUE klass)
|
|||
* Greater than 15::
|
||||
* Add 32 to window_bits to enable zlib and gzip decoding with automatic
|
||||
* header detection, or add 16 to decode only the gzip format (a
|
||||
* Zlib::DataError will be raised for a non-gzip stream).
|
||||
* Zlib::DataError will be raised for a non-gzip stream).
|
||||
*
|
||||
* (-8..-15)::
|
||||
* Enables raw deflate mode which will not generate a check value, and will
|
||||
|
|
Loading…
Add table
Reference in a new issue