From a7b5938715acb57b1a168fe8f1f60b9549ddcea5 Mon Sep 17 00:00:00 2001 From: Jan Lehnardt Date: Sun, 14 Oct 2012 14:44:06 +0200 Subject: [PATCH 1/5] docs: fix copy and paste error --- doc/api/fs.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/fs.markdown b/doc/api/fs.markdown index 6e436763b24..a6b31e63f04 100644 --- a/doc/api/fs.markdown +++ b/doc/api/fs.markdown @@ -365,7 +365,7 @@ Read data from the file specified by `fd`. `buffer` is the buffer that the data will be written to. -`offset` is offset within the buffer where writing will start. +`offset` is offset within the buffer where reading will start. `length` is an integer specifying the number of bytes to read. From 28b0cc08b8c9a461c1560da52c3bc30c4e7a996b Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 15 Oct 2012 23:40:15 +0200 Subject: [PATCH 2/5] Revert "Disable OpenSSL UI" This reverts commit 1c88c3b3b56c6047180e116c5614dad2b13995f9. It breaks the "read a password from stdin" functionality that OpenSSL provides. Fixes #4059, #4143. Conflicts: deps/openssl/openssl.gyp --- deps/openssl/openssl.gyp | 2 - deps/openssl/openssl/crypto/ui/ui_dummy.c | 95 --------------------- deps/openssl/openssl/crypto/ui/ui_openssl.c | 3 - 3 files changed, 100 deletions(-) delete mode 100644 deps/openssl/openssl/crypto/ui/ui_dummy.c diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index 37aff68a38c..6ece3ee3f22 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -19,7 +19,6 @@ # Work around brain dead SunOS linker. 'OPENSSL_NO_GOST', 'OPENSSL_NO_HW_PADLOCK', - 'OPENSSL_NO_TTY' ], 'sources': [ 'openssl/ssl/bio_ssl.c', @@ -536,7 +535,6 @@ 'openssl/crypto/ui/ui_compat.c', 'openssl/crypto/ui/ui_err.c', 'openssl/crypto/ui/ui_lib.c', - 'openssl/crypto/ui/ui_dummy.c', 'openssl/crypto/ui/ui_openssl.c', 'openssl/crypto/ui/ui_util.c', 'openssl/crypto/uid.c', diff --git a/deps/openssl/openssl/crypto/ui/ui_dummy.c b/deps/openssl/openssl/crypto/ui/ui_dummy.c deleted file mode 100644 index 1042910965c..00000000000 --- a/deps/openssl/openssl/crypto/ui/ui_dummy.c +++ /dev/null @@ -1,95 +0,0 @@ -/* ==================================================================== - * Copyright (c) 2001 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.openssl.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * openssl-core@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.openssl.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - * This product includes cryptographic software written by Eric Young - * (eay@cryptsoft.com). This product includes software written by Tim - * Hudson (tjh@cryptsoft.com). - * - */ - - -#include -#include -#include "ui_locl.h" -#include "cryptlib.h" - -#ifdef OPENSSL_NO_TTY - -static int dummy_read_write_string(UI *ui, UI_STRING *uis); -static int dummy_open_close(UI *ui); - -static UI_METHOD ui_dummy = - { - "Dummy user interface", - dummy_open_close, - dummy_read_write_string, - NULL, - dummy_read_write_string, - dummy_open_close, - NULL - }; - -UI_METHOD *UI_OpenSSL(void) - { - return &ui_dummy; - } - -static int dummy_open_close(UI *ui) - { - /* Pretend that opening and closing the dummy UI succeeds. */ - return 1; - } - -static int dummy_read_write_string(UI *ui, UI_STRING *uis) - { - /* Writing to and reading from the dummy UI is not possible. */ - return 0; - } - - -#endif diff --git a/deps/openssl/openssl/crypto/ui/ui_openssl.c b/deps/openssl/openssl/crypto/ui/ui_openssl.c index 9360af10ea9..b05cbf348fa 100644 --- a/deps/openssl/openssl/crypto/ui/ui_openssl.c +++ b/deps/openssl/openssl/crypto/ui/ui_openssl.c @@ -114,7 +114,6 @@ * [including the GNU Public Licence.] */ -#ifndef OPENSSL_NO_TTY #include @@ -711,5 +710,3 @@ static int noecho_fgets(char *buf, int size, FILE *tty) return(strlen(buf)); } #endif - -#endif From 1205734e69df2cecce88d67aa9e6b32a843d1633 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Wed, 19 Sep 2012 14:37:08 +0200 Subject: [PATCH 3/5] configure: turn on VFPv3 on ARMv7 Fixes a V8 build error caused by missing arm_fpu and arm_neon settings. This is a back-port of commit bbf6b4e from the master branch. Fixes #4142. --- configure | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/configure b/configure index 8a2b3d645f5..cfd11aa5aec 100755 --- a/configure +++ b/configure @@ -322,6 +322,23 @@ def compiler_version(): return (version, is_clang) +def configure_arm(o): + # V8 on ARM requires that armv7 is set. CPU Model detected by + # the presence of __ARM_ARCH_7__ and the like defines in compiler + if options.arm_float_abi: + hard_float = options.arm_float_abi == 'hard' + else: + hard_float = arm_hard_float_abi() + o['variables']['v8_use_arm_eabi_hardfloat'] = b(hard_float) + + armv7 = is_arch_armv7() + if armv7: + # CHECKME VFPv3 implies ARMv7+ but is the reverse true as well? + o['variables']['arm_fpu'] = 'vfpv3' + o['variables']['arm_neon'] = 0 + o['variables']['armv7'] = int(armv7) + + def configure_node(o): # TODO add gdb o['variables']['v8_no_strict_aliasing'] = 1 # work around compiler bugs @@ -335,15 +352,8 @@ def configure_node(o): o['variables']['host_arch'] = host_arch o['variables']['target_arch'] = target_arch - # V8 on ARM requires that armv7 is set. CPU Model detected by - # the presence of __ARM_ARCH_7__ and the like defines in compiler if target_arch == 'arm': - if options.arm_float_abi: - hard_float = options.arm_float_abi == 'hard' - else: - hard_float = arm_hard_float_abi() - o['variables']['v8_use_arm_eabi_hardfloat'] = b(hard_float) - o['variables']['armv7'] = 1 if is_arch_armv7() else 0 + configure_arm(o) cc_version, is_clang = compiler_version() o['variables']['clang'] = 1 if is_clang else 0 From cca15e8e33e94258d8b881786c27d461d5488982 Mon Sep 17 00:00:00 2001 From: Nathan Rajlich Date: Mon, 15 Oct 2012 14:51:43 -0700 Subject: [PATCH 4/5] test: disable global variable check for "test-repl-options.js" Previously, the "global" mode of REPLs was broken when created after another non-global REPL (they would end up sharing the same context). Now that "global" mode is fixed for that case (b1e78cef097c682ed63528ad7efe294b18a9fb1d), this test case gets its global scope modified with "module" and other REPL-specific properties, so disable the global check. --- test/simple/test-repl-options.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/test/simple/test-repl-options.js b/test/simple/test-repl-options.js index c3a83aeb00a..d3fcd588ee8 100644 --- a/test/simple/test-repl-options.js +++ b/test/simple/test-repl-options.js @@ -24,6 +24,8 @@ var common = require('../common'), Stream = require('stream'), repl = require('repl'); +common.globalCheck = false; + // create a dummy stream that does nothing var stream = new Stream(); stream.write = stream.pause = stream.resume = function(){}; From 627f0d27e827295cf8e7442b89d4fc5708ef5d8d Mon Sep 17 00:00:00 2001 From: isaacs Date: Tue, 16 Oct 2012 10:59:23 -0700 Subject: [PATCH 5/5] doc: Typo. s/arguemnt/argument/ --- doc/api/crypto.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/api/crypto.markdown b/doc/api/crypto.markdown index 87da3a78dad..00ed3944155 100644 --- a/doc/api/crypto.markdown +++ b/doc/api/crypto.markdown @@ -390,7 +390,7 @@ Verify object. However, if you are doing things with the string data that will not work properly on Buffers (such as, concatenating them, storing in databases, etc.), or you are passing binary strings to the crypto -functions without an encoding arguemnt, then you will need to start +functions without an encoding argument, then you will need to start providing encoding arguments to specify which encoding you'd like to use.