diff options
author | Shigeki Ohtsu <ohtsu@iij.ad.jp> | 2015-03-19 23:04:41 +0900 |
---|---|---|
committer | Chris Dickinson <christopher.s.dickinson@gmail.com> | 2015-03-19 10:08:13 -0700 |
commit | a84ea66b35cce2e44fa35699a2a09194b0a5210c (patch) | |
tree | 0a94aa744bfa238bc22935a360452a74cf450941 /deps/openssl/openssl/crypto/conf/conf_sap.c | |
parent | 3bc445f6c260586720ee8931f20148d612d283ce (diff) | |
download | android-node-v8-a84ea66b35cce2e44fa35699a2a09194b0a5210c.tar.gz android-node-v8-a84ea66b35cce2e44fa35699a2a09194b0a5210c.tar.bz2 android-node-v8-a84ea66b35cce2e44fa35699a2a09194b0a5210c.zip |
deps: upgrade to openssl-1.0.1m
All sources are just extracted from tarball into deps/openssl/openssl.
change all openssl/include/openssl/*.h to include resolved symbolic
links and openssl/crypto/opensslconf.h to refer config/opensslconf.h
sha256-x86_64.pl does not exist in the origin openssl distribution. It
was copied from sha512-x86_64.pl and both sha256/sha512 scripts were
modified so as to generates only one asm file specified as its key
hash length.
`x86masm.pl` was mistakenly using .486 instruction set, why `cpuid`
(and perhaps others) are requiring .686.
removed vpaesni-x86_64.asm in x64-win32-masm - it is no longer used.
Fixes: https://github.com/iojs/io.js/issues/1186
PR-URL: https://github.com/iojs/io.js/pull/1206
Reviewed-By: Fedor Indutny <fedor@indutny.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/openssl/openssl/crypto/conf/conf_sap.c')
-rw-r--r-- | deps/openssl/openssl/crypto/conf/conf_sap.c | 59 |
1 files changed, 23 insertions, 36 deletions
diff --git a/deps/openssl/openssl/crypto/conf/conf_sap.c b/deps/openssl/openssl/crypto/conf/conf_sap.c index 760dc2632d..544fe97387 100644 --- a/deps/openssl/openssl/crypto/conf/conf_sap.c +++ b/deps/openssl/openssl/crypto/conf/conf_sap.c @@ -1,6 +1,7 @@ /* conf_sap.c */ -/* Written by Stephen Henson (steve@openssl.org) for the OpenSSL - * project 2001. +/* + * Written by Stephen Henson (steve@openssl.org) for the OpenSSL project + * 2001. */ /* ==================================================================== * Copyright (c) 2001 The OpenSSL Project. All rights reserved. @@ -10,7 +11,7 @@ * are met: * * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. + * 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 @@ -64,48 +65,34 @@ #include <openssl/x509.h> #include <openssl/asn1.h> #ifndef OPENSSL_NO_ENGINE -#include <openssl/engine.h> +# include <openssl/engine.h> #endif -/* This is the automatic configuration loader: it is called automatically by - * OpenSSL when any of a number of standard initialisation functions are called, - * unless this is overridden by calling OPENSSL_no_config() +/* + * This is the automatic configuration loader: it is called automatically by + * OpenSSL when any of a number of standard initialisation functions are + * called, unless this is overridden by calling OPENSSL_no_config() */ static int openssl_configured = 0; void OPENSSL_config(const char *config_name) - { - if (openssl_configured) - return; +{ + if (openssl_configured) + return; - OPENSSL_load_builtin_modules(); + OPENSSL_load_builtin_modules(); #ifndef OPENSSL_NO_ENGINE - /* Need to load ENGINEs */ - ENGINE_load_builtin_engines(); + /* Need to load ENGINEs */ + ENGINE_load_builtin_engines(); #endif - /* Add others here? */ - - - ERR_clear_error(); - if (CONF_modules_load_file(NULL, config_name, - CONF_MFLAGS_DEFAULT_SECTION|CONF_MFLAGS_IGNORE_MISSING_FILE) <= 0) - { - BIO *bio_err; - ERR_load_crypto_strings(); - if ((bio_err=BIO_new_fp(stderr, BIO_NOCLOSE)) != NULL) - { - BIO_printf(bio_err,"Auto configuration failed\n"); - ERR_print_errors(bio_err); - BIO_free(bio_err); - } - exit(1); - } - - return; - } + ERR_clear_error(); + CONF_modules_load_file(NULL, config_name, + CONF_MFLAGS_DEFAULT_SECTION | + CONF_MFLAGS_IGNORE_MISSING_FILE); +} void OPENSSL_no_config() - { - openssl_configured = 1; - } +{ + openssl_configured = 1; +} |