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/engines/e_nuron_err.h | |
| 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/engines/e_nuron_err.h')
| -rw-r--r-- | deps/openssl/openssl/engines/e_nuron_err.h | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/deps/openssl/openssl/engines/e_nuron_err.h b/deps/openssl/openssl/engines/e_nuron_err.h index 219babbb45..aa7849c6a9 100644 --- a/deps/openssl/openssl/engines/e_nuron_err.h +++ b/deps/openssl/openssl/engines/e_nuron_err.h @@ -6,7 +6,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 @@ -53,36 +53,37 @@ */ #ifndef HEADER_NURON_ERR_H -#define HEADER_NURON_ERR_H +# define HEADER_NURON_ERR_H #ifdef __cplusplus extern "C" { #endif /* BEGIN ERROR CODES */ -/* The following lines are auto generated by the script mkerr.pl. Any changes +/* + * The following lines are auto generated by the script mkerr.pl. Any changes * made after this point may be overwritten when the script is next run. */ static void ERR_load_NURON_strings(void); static void ERR_unload_NURON_strings(void); static void ERR_NURON_error(int function, int reason, char *file, int line); -#define NURONerr(f,r) ERR_NURON_error((f),(r),__FILE__,__LINE__) +# define NURONerr(f,r) ERR_NURON_error((f),(r),__FILE__,__LINE__) /* Error codes for the NURON functions. */ /* Function codes. */ -#define NURON_F_NURON_CTRL 100 -#define NURON_F_NURON_FINISH 101 -#define NURON_F_NURON_INIT 102 -#define NURON_F_NURON_MOD_EXP 103 +# define NURON_F_NURON_CTRL 100 +# define NURON_F_NURON_FINISH 101 +# define NURON_F_NURON_INIT 102 +# define NURON_F_NURON_MOD_EXP 103 /* Reason codes. */ -#define NURON_R_ALREADY_LOADED 100 -#define NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED 101 -#define NURON_R_DSO_FAILURE 102 -#define NURON_R_DSO_FUNCTION_NOT_FOUND 103 -#define NURON_R_DSO_NOT_FOUND 104 -#define NURON_R_NOT_LOADED 105 +# define NURON_R_ALREADY_LOADED 100 +# define NURON_R_CTRL_COMMAND_NOT_IMPLEMENTED 101 +# define NURON_R_DSO_FAILURE 102 +# define NURON_R_DSO_FUNCTION_NOT_FOUND 103 +# define NURON_R_DSO_NOT_FOUND 104 +# define NURON_R_NOT_LOADED 105 #ifdef __cplusplus } |