Browse Source

deps: upgrade openssl sources to 1.0.2c

This just replaces all sources of openssl-1.0.2c.tar.gz
into deps/openssl/openssl

PR-URL: https://github.com/nodejs/io.js/pull/1958
Reviewed-By: Fedor Indutny <fedor@indutny.com>
v2.3.1-release
Shigeki Ohtsu 9 years ago
parent
commit
86737cf0a0
  1. 6
      deps/openssl/openssl/CHANGES
  2. 2
      deps/openssl/openssl/Makefile
  3. 2
      deps/openssl/openssl/Makefile.bak
  4. 4
      deps/openssl/openssl/NEWS
  5. 2
      deps/openssl/openssl/README
  6. 14
      deps/openssl/openssl/apps/app_rand.c
  7. 31
      deps/openssl/openssl/apps/s_client.c
  8. 19
      deps/openssl/openssl/crypto/hmac/hmac.c
  9. 1
      deps/openssl/openssl/crypto/hmac/hmac.h
  10. 7
      deps/openssl/openssl/crypto/hmac/hmactest.c
  11. 254
      deps/openssl/openssl/crypto/opensslconf.h
  12. 6
      deps/openssl/openssl/crypto/opensslv.h
  13. 14
      deps/openssl/openssl/crypto/perlasm/x86masm.pl
  14. 1
      deps/openssl/openssl/include/openssl/aes.h
  15. 1
      deps/openssl/openssl/include/openssl/aes.h
  16. 1
      deps/openssl/openssl/include/openssl/asn1.h
  17. 1
      deps/openssl/openssl/include/openssl/asn1.h
  18. 1
      deps/openssl/openssl/include/openssl/asn1_mac.h
  19. 1
      deps/openssl/openssl/include/openssl/asn1_mac.h
  20. 1
      deps/openssl/openssl/include/openssl/asn1t.h
  21. 1
      deps/openssl/openssl/include/openssl/asn1t.h
  22. 1
      deps/openssl/openssl/include/openssl/bio.h
  23. 1
      deps/openssl/openssl/include/openssl/bio.h
  24. 1
      deps/openssl/openssl/include/openssl/blowfish.h
  25. 1
      deps/openssl/openssl/include/openssl/blowfish.h
  26. 1
      deps/openssl/openssl/include/openssl/bn.h
  27. 1
      deps/openssl/openssl/include/openssl/bn.h
  28. 1
      deps/openssl/openssl/include/openssl/buffer.h
  29. 1
      deps/openssl/openssl/include/openssl/buffer.h
  30. 1
      deps/openssl/openssl/include/openssl/camellia.h
  31. 1
      deps/openssl/openssl/include/openssl/camellia.h
  32. 1
      deps/openssl/openssl/include/openssl/cast.h
  33. 1
      deps/openssl/openssl/include/openssl/cast.h
  34. 1
      deps/openssl/openssl/include/openssl/cmac.h
  35. 1
      deps/openssl/openssl/include/openssl/cmac.h
  36. 1
      deps/openssl/openssl/include/openssl/cms.h
  37. 1
      deps/openssl/openssl/include/openssl/cms.h
  38. 1
      deps/openssl/openssl/include/openssl/comp.h
  39. 1
      deps/openssl/openssl/include/openssl/comp.h
  40. 1
      deps/openssl/openssl/include/openssl/conf.h
  41. 1
      deps/openssl/openssl/include/openssl/conf.h
  42. 1
      deps/openssl/openssl/include/openssl/conf_api.h
  43. 1
      deps/openssl/openssl/include/openssl/conf_api.h
  44. 1
      deps/openssl/openssl/include/openssl/crypto.h
  45. 1
      deps/openssl/openssl/include/openssl/crypto.h
  46. 1
      deps/openssl/openssl/include/openssl/des.h
  47. 1
      deps/openssl/openssl/include/openssl/des.h
  48. 1
      deps/openssl/openssl/include/openssl/des_old.h
  49. 1
      deps/openssl/openssl/include/openssl/des_old.h
  50. 1
      deps/openssl/openssl/include/openssl/dh.h
  51. 1
      deps/openssl/openssl/include/openssl/dh.h
  52. 1
      deps/openssl/openssl/include/openssl/dsa.h
  53. 1
      deps/openssl/openssl/include/openssl/dsa.h
  54. 1
      deps/openssl/openssl/include/openssl/dso.h
  55. 1
      deps/openssl/openssl/include/openssl/dso.h
  56. 1
      deps/openssl/openssl/include/openssl/dtls1.h
  57. 1
      deps/openssl/openssl/include/openssl/dtls1.h
  58. 1
      deps/openssl/openssl/include/openssl/e_os2.h
  59. 1
      deps/openssl/openssl/include/openssl/e_os2.h
  60. 1
      deps/openssl/openssl/include/openssl/ebcdic.h
  61. 1
      deps/openssl/openssl/include/openssl/ebcdic.h
  62. 1
      deps/openssl/openssl/include/openssl/ec.h
  63. 1
      deps/openssl/openssl/include/openssl/ec.h
  64. 1
      deps/openssl/openssl/include/openssl/ecdh.h
  65. 1
      deps/openssl/openssl/include/openssl/ecdh.h
  66. 1
      deps/openssl/openssl/include/openssl/ecdsa.h
  67. 1
      deps/openssl/openssl/include/openssl/ecdsa.h
  68. 1
      deps/openssl/openssl/include/openssl/engine.h
  69. 1
      deps/openssl/openssl/include/openssl/engine.h
  70. 1
      deps/openssl/openssl/include/openssl/err.h
  71. 1
      deps/openssl/openssl/include/openssl/err.h
  72. 1
      deps/openssl/openssl/include/openssl/evp.h
  73. 1
      deps/openssl/openssl/include/openssl/evp.h
  74. 1
      deps/openssl/openssl/include/openssl/hmac.h
  75. 1
      deps/openssl/openssl/include/openssl/hmac.h
  76. 1
      deps/openssl/openssl/include/openssl/idea.h
  77. 1
      deps/openssl/openssl/include/openssl/idea.h
  78. 1
      deps/openssl/openssl/include/openssl/krb5_asn.h
  79. 1
      deps/openssl/openssl/include/openssl/krb5_asn.h
  80. 1
      deps/openssl/openssl/include/openssl/kssl.h
  81. 1
      deps/openssl/openssl/include/openssl/kssl.h
  82. 1
      deps/openssl/openssl/include/openssl/lhash.h
  83. 1
      deps/openssl/openssl/include/openssl/lhash.h
  84. 1
      deps/openssl/openssl/include/openssl/md4.h
  85. 1
      deps/openssl/openssl/include/openssl/md4.h
  86. 1
      deps/openssl/openssl/include/openssl/md5.h
  87. 1
      deps/openssl/openssl/include/openssl/md5.h
  88. 1
      deps/openssl/openssl/include/openssl/mdc2.h
  89. 1
      deps/openssl/openssl/include/openssl/mdc2.h
  90. 1
      deps/openssl/openssl/include/openssl/modes.h
  91. 1
      deps/openssl/openssl/include/openssl/modes.h
  92. 1
      deps/openssl/openssl/include/openssl/obj_mac.h
  93. 1
      deps/openssl/openssl/include/openssl/obj_mac.h
  94. 1
      deps/openssl/openssl/include/openssl/objects.h
  95. 1
      deps/openssl/openssl/include/openssl/objects.h
  96. 1
      deps/openssl/openssl/include/openssl/ocsp.h
  97. 1
      deps/openssl/openssl/include/openssl/ocsp.h
  98. 1
      deps/openssl/openssl/include/openssl/opensslconf.h
  99. 1
      deps/openssl/openssl/include/openssl/opensslconf.h
  100. 1
      deps/openssl/openssl/include/openssl/opensslv.h

6
deps/openssl/openssl/CHANGES

@ -2,6 +2,12 @@
OpenSSL CHANGES OpenSSL CHANGES
_______________ _______________
Changes between 1.0.2b and 1.0.2c [12 Jun 2015]
*) Fix HMAC ABI incompatibility. The previous version introduced an ABI
incompatibility in the handling of HMAC. The previous ABI has now been
restored.
Changes between 1.0.2a and 1.0.2b [11 Jun 2015] Changes between 1.0.2a and 1.0.2b [11 Jun 2015]
*) Malformed ECParameters causes infinite loop *) Malformed ECParameters causes infinite loop

2
deps/openssl/openssl/Makefile

@ -4,7 +4,7 @@
## Makefile for OpenSSL ## Makefile for OpenSSL
## ##
VERSION=1.0.2b VERSION=1.0.2c
MAJOR=1 MAJOR=1
MINOR=0.2 MINOR=0.2
SHLIB_VERSION_NUMBER=1.0.0 SHLIB_VERSION_NUMBER=1.0.0

2
deps/openssl/openssl/Makefile.bak

@ -4,7 +4,7 @@
## Makefile for OpenSSL ## Makefile for OpenSSL
## ##
VERSION=1.0.2b-dev VERSION=1.0.2c-dev
MAJOR=1 MAJOR=1
MINOR=0.2 MINOR=0.2
SHLIB_VERSION_NUMBER=1.0.0 SHLIB_VERSION_NUMBER=1.0.0

4
deps/openssl/openssl/NEWS

@ -5,6 +5,10 @@
This file gives a brief overview of the major changes between each OpenSSL This file gives a brief overview of the major changes between each OpenSSL
release. For more details please read the CHANGES file. release. For more details please read the CHANGES file.
Major changes between OpenSSL 1.0.2b and OpenSSL 1.0.2c [12 Jun 2015]
o Fix HMAC ABI incompatibility
Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [11 Jun 2015] Major changes between OpenSSL 1.0.2a and OpenSSL 1.0.2b [11 Jun 2015]
o Malformed ECParameters causes infinite loop (CVE-2015-1788) o Malformed ECParameters causes infinite loop (CVE-2015-1788)

2
deps/openssl/openssl/README

@ -1,5 +1,5 @@
OpenSSL 1.0.2b 11 Jun 2015 OpenSSL 1.0.2c 12 Jun 2015
Copyright (c) 1998-2011 The OpenSSL Project Copyright (c) 1998-2011 The OpenSSL Project
Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson

14
deps/openssl/openssl/apps/app_rand.c

@ -124,16 +124,10 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
char buffer[200]; char buffer[200];
#ifdef OPENSSL_SYS_WINDOWS #ifdef OPENSSL_SYS_WINDOWS
/* BIO_printf(bio_e, "Loading 'screen' into random state -");
* allocate 2 to dont_warn not to use RAND_screen() via BIO_flush(bio_e);
* -no_rand_screen option in s_client RAND_screen();
*/ BIO_printf(bio_e, " done\n");
if (dont_warn != 2) {
BIO_printf(bio_e, "Loading 'screen' into random state -");
BIO_flush(bio_e);
RAND_screen();
BIO_printf(bio_e, " done\n");
}
#endif #endif
if (file == NULL) if (file == NULL)

31
deps/openssl/openssl/apps/s_client.c

@ -180,13 +180,6 @@ typedef unsigned int u_int;
# include <fcntl.h> # include <fcntl.h>
#endif #endif
/* Use Windows API with STD_INPUT_HANDLE when checking for input?
Don't look at OPENSSL_SYS_MSDOS for this, since it is always defined if
OPENSSL_SYS_WINDOWS is defined */
#if defined(OPENSSL_SYS_WINDOWS) && !defined(OPENSSL_SYS_WINCE) && defined(STD_INPUT_HANDLE)
#define OPENSSL_USE_STD_INPUT_HANDLE
#endif
#undef PROG #undef PROG
#define PROG s_client_main #define PROG s_client_main
@ -236,7 +229,6 @@ static BIO *bio_c_msg = NULL;
static int c_quiet = 0; static int c_quiet = 0;
static int c_ign_eof = 0; static int c_ign_eof = 0;
static int c_brief = 0; static int c_brief = 0;
static int c_no_rand_screen = 0;
#ifndef OPENSSL_NO_PSK #ifndef OPENSSL_NO_PSK
/* Default PSK identity and key */ /* Default PSK identity and key */
@ -449,10 +441,6 @@ static void sc_usage(void)
" -keymatexport label - Export keying material using label\n"); " -keymatexport label - Export keying material using label\n");
BIO_printf(bio_err, BIO_printf(bio_err,
" -keymatexportlen len - Export len bytes of keying material (default 20)\n"); " -keymatexportlen len - Export len bytes of keying material (default 20)\n");
#ifdef OPENSSL_SYS_WINDOWS
BIO_printf(bio_err,
" -no_rand_screen - Do not use RAND_screen() to initialize random state\n");
#endif
} }
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
@ -1132,10 +1120,6 @@ int MAIN(int argc, char **argv)
keymatexportlen = atoi(*(++argv)); keymatexportlen = atoi(*(++argv));
if (keymatexportlen == 0) if (keymatexportlen == 0)
goto bad; goto bad;
#ifdef OPENSSL_SYS_WINDOWS
} else if (strcmp(*argv, "-no_rand_screen") == 0) {
c_no_rand_screen = 1;
#endif
} else { } else {
BIO_printf(bio_err, "unknown option %s\n", *argv); BIO_printf(bio_err, "unknown option %s\n", *argv);
badop = 1; badop = 1;
@ -1241,7 +1225,7 @@ int MAIN(int argc, char **argv)
if (!load_excert(&exc, bio_err)) if (!load_excert(&exc, bio_err))
goto end; goto end;
if (!app_RAND_load_file(NULL, bio_err, ++c_no_rand_screen) && inrand == NULL if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
&& !RAND_status()) { && !RAND_status()) {
BIO_printf(bio_err, BIO_printf(bio_err,
"warning, not much extra random data, consider using the -rand option\n"); "warning, not much extra random data, consider using the -rand option\n");
@ -1774,7 +1758,10 @@ int MAIN(int argc, char **argv)
tv.tv_usec = 0; tv.tv_usec = 0;
i = select(width, (void *)&readfds, (void *)&writefds, i = select(width, (void *)&readfds, (void *)&writefds,
NULL, &tv); NULL, &tv);
#if defined(OPENSSL_USE_STD_INPUT_HANDLE) # if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)
if (!i && (!_kbhit() || !read_tty))
continue;
# else
if (!i && (!((_kbhit()) if (!i && (!((_kbhit())
|| (WAIT_OBJECT_0 == || (WAIT_OBJECT_0 ==
WaitForSingleObject(GetStdHandle WaitForSingleObject(GetStdHandle
@ -1782,8 +1769,6 @@ int MAIN(int argc, char **argv)
0))) 0)))
|| !read_tty)) || !read_tty))
continue; continue;
#else
if(!i && (!_kbhit() || !read_tty) ) continue;
# endif # endif
} else } else
i = select(width, (void *)&readfds, (void *)&writefds, i = select(width, (void *)&readfds, (void *)&writefds,
@ -1985,12 +1970,12 @@ int MAIN(int argc, char **argv)
} }
} }
#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS) #if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
#if defined(OPENSSL_USE_STD_INPUT_HANDLE) # if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)
else if (_kbhit())
# else
else if ((_kbhit()) else if ((_kbhit())
|| (WAIT_OBJECT_0 == || (WAIT_OBJECT_0 ==
WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
#else
else if (_kbhit())
# endif # endif
#elif defined (OPENSSL_SYS_NETWARE) #elif defined (OPENSSL_SYS_NETWARE)
else if (_kbhit()) else if (_kbhit())

19
deps/openssl/openssl/crypto/hmac/hmac.c

@ -97,6 +97,9 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
return FIPS_hmac_init_ex(ctx, key, len, md, NULL); return FIPS_hmac_init_ex(ctx, key, len, md, NULL);
} }
#endif #endif
/* If we are changing MD then we must have a key */
if (md != NULL && md != ctx->md && (key == NULL || len < 0))
return 0;
if (md != NULL) { if (md != NULL) {
reset = 1; reset = 1;
@ -107,9 +110,6 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
return 0; return 0;
} }
if (!ctx->key_init && key == NULL)
return 0;
if (key != NULL) { if (key != NULL) {
reset = 1; reset = 1;
j = EVP_MD_block_size(md); j = EVP_MD_block_size(md);
@ -131,7 +131,6 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
if (ctx->key_length != HMAC_MAX_MD_CBLOCK) if (ctx->key_length != HMAC_MAX_MD_CBLOCK)
memset(&ctx->key[ctx->key_length], 0, memset(&ctx->key[ctx->key_length], 0,
HMAC_MAX_MD_CBLOCK - ctx->key_length); HMAC_MAX_MD_CBLOCK - ctx->key_length);
ctx->key_init = 1;
} }
if (reset) { if (reset) {
@ -169,7 +168,7 @@ int HMAC_Update(HMAC_CTX *ctx, const unsigned char *data, size_t len)
if (FIPS_mode() && !ctx->i_ctx.engine) if (FIPS_mode() && !ctx->i_ctx.engine)
return FIPS_hmac_update(ctx, data, len); return FIPS_hmac_update(ctx, data, len);
#endif #endif
if (!ctx->key_init) if (!ctx->md)
return 0; return 0;
return EVP_DigestUpdate(&ctx->md_ctx, data, len); return EVP_DigestUpdate(&ctx->md_ctx, data, len);
@ -184,7 +183,7 @@ int HMAC_Final(HMAC_CTX *ctx, unsigned char *md, unsigned int *len)
return FIPS_hmac_final(ctx, md, len); return FIPS_hmac_final(ctx, md, len);
#endif #endif
if (!ctx->key_init) if (!ctx->md)
goto err; goto err;
if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i)) if (!EVP_DigestFinal_ex(&ctx->md_ctx, buf, &i))
@ -205,7 +204,6 @@ void HMAC_CTX_init(HMAC_CTX *ctx)
EVP_MD_CTX_init(&ctx->i_ctx); EVP_MD_CTX_init(&ctx->i_ctx);
EVP_MD_CTX_init(&ctx->o_ctx); EVP_MD_CTX_init(&ctx->o_ctx);
EVP_MD_CTX_init(&ctx->md_ctx); EVP_MD_CTX_init(&ctx->md_ctx);
ctx->key_init = 0;
ctx->md = NULL; ctx->md = NULL;
} }
@ -217,11 +215,8 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
goto err; goto err;
if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx)) if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx))
goto err; goto err;
dctx->key_init = sctx->key_init; memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
if (sctx->key_init) { dctx->key_length = sctx->key_length;
memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
dctx->key_length = sctx->key_length;
}
dctx->md = sctx->md; dctx->md = sctx->md;
return 1; return 1;
err: err:

1
deps/openssl/openssl/crypto/hmac/hmac.h

@ -79,7 +79,6 @@ typedef struct hmac_ctx_st {
EVP_MD_CTX o_ctx; EVP_MD_CTX o_ctx;
unsigned int key_length; unsigned int key_length;
unsigned char key[HMAC_MAX_MD_CBLOCK]; unsigned char key[HMAC_MAX_MD_CBLOCK];
int key_init;
} HMAC_CTX; } HMAC_CTX;
# define HMAC_size(e) (EVP_MD_size((e)->md)) # define HMAC_size(e) (EVP_MD_size((e)->md))

7
deps/openssl/openssl/crypto/hmac/hmactest.c

@ -233,7 +233,12 @@ test5:
err++; err++;
goto test6; goto test6;
} }
if (!HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) { if (HMAC_Init_ex(&ctx, NULL, 0, EVP_sha256(), NULL)) {
printf("Should disallow changing MD without a new key (test 5)\n");
err++;
goto test6;
}
if (!HMAC_Init_ex(&ctx, test[4].key, test[4].key_len, EVP_sha256(), NULL)) {
printf("Failed to reinitialise HMAC (test 5)\n"); printf("Failed to reinitialise HMAC (test 5)\n");
err++; err++;
goto test6; goto test6;

254
deps/openssl/openssl/crypto/opensslconf.h

@ -1 +1,253 @@
#include "../../config/opensslconf.h" /* opensslconf.h */
/* WARNING: Generated automatically from opensslconf.h.in by Configure. */
#ifdef __cplusplus
extern "C" {
#endif
/* OpenSSL was configured with the following options: */
#ifndef OPENSSL_DOING_MAKEDEPEND
#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
# define OPENSSL_NO_EC_NISTP_64_GCC_128
#endif
#ifndef OPENSSL_NO_GMP
# define OPENSSL_NO_GMP
#endif
#ifndef OPENSSL_NO_JPAKE
# define OPENSSL_NO_JPAKE
#endif
#ifndef OPENSSL_NO_KRB5
# define OPENSSL_NO_KRB5
#endif
#ifndef OPENSSL_NO_LIBUNBOUND
# define OPENSSL_NO_LIBUNBOUND
#endif
#ifndef OPENSSL_NO_MD2
# define OPENSSL_NO_MD2
#endif
#ifndef OPENSSL_NO_RC5
# define OPENSSL_NO_RC5
#endif
#ifndef OPENSSL_NO_RFC3779
# define OPENSSL_NO_RFC3779
#endif
#ifndef OPENSSL_NO_SCTP
# define OPENSSL_NO_SCTP
#endif
#ifndef OPENSSL_NO_SSL_TRACE
# define OPENSSL_NO_SSL_TRACE
#endif
#ifndef OPENSSL_NO_STORE
# define OPENSSL_NO_STORE
#endif
#ifndef OPENSSL_NO_UNIT_TEST
# define OPENSSL_NO_UNIT_TEST
#endif
#endif /* OPENSSL_DOING_MAKEDEPEND */
#ifndef OPENSSL_NO_DYNAMIC_ENGINE
# define OPENSSL_NO_DYNAMIC_ENGINE
#endif
/* The OPENSSL_NO_* macros are also defined as NO_* if the application
asks for it. This is a transient feature that is provided for those
who haven't had the time to do the appropriate changes in their
applications. */
#ifdef OPENSSL_ALGORITHM_DEFINES
# if defined(OPENSSL_NO_EC_NISTP_64_GCC_128) && !defined(NO_EC_NISTP_64_GCC_128)
# define NO_EC_NISTP_64_GCC_128
# endif
# if defined(OPENSSL_NO_GMP) && !defined(NO_GMP)
# define NO_GMP
# endif
# if defined(OPENSSL_NO_JPAKE) && !defined(NO_JPAKE)
# define NO_JPAKE
# endif
# if defined(OPENSSL_NO_KRB5) && !defined(NO_KRB5)
# define NO_KRB5
# endif
# if defined(OPENSSL_NO_LIBUNBOUND) && !defined(NO_LIBUNBOUND)
# define NO_LIBUNBOUND
# endif
# if defined(OPENSSL_NO_MD2) && !defined(NO_MD2)
# define NO_MD2
# endif
# if defined(OPENSSL_NO_RC5) && !defined(NO_RC5)
# define NO_RC5
# endif
# if defined(OPENSSL_NO_RFC3779) && !defined(NO_RFC3779)
# define NO_RFC3779
# endif
# if defined(OPENSSL_NO_SCTP) && !defined(NO_SCTP)
# define NO_SCTP
# endif
# if defined(OPENSSL_NO_SSL_TRACE) && !defined(NO_SSL_TRACE)
# define NO_SSL_TRACE
# endif
# if defined(OPENSSL_NO_STORE) && !defined(NO_STORE)
# define NO_STORE
# endif
# if defined(OPENSSL_NO_UNIT_TEST) && !defined(NO_UNIT_TEST)
# define NO_UNIT_TEST
# endif
#endif
/* crypto/opensslconf.h.in */
/* Generate 80386 code? */
#undef I386_ONLY
#if !(defined(VMS) || defined(__VMS)) /* VMS uses logical names instead */
#if defined(HEADER_CRYPTLIB_H) && !defined(OPENSSLDIR)
#define ENGINESDIR "/usr/local/ssl/lib/engines"
#define OPENSSLDIR "/usr/local/ssl"
#endif
#endif
#undef OPENSSL_UNISTD
#define OPENSSL_UNISTD <unistd.h>
#undef OPENSSL_EXPORT_VAR_AS_FUNCTION
#if defined(HEADER_IDEA_H) && !defined(IDEA_INT)
#define IDEA_INT unsigned int
#endif
#if defined(HEADER_MD2_H) && !defined(MD2_INT)
#define MD2_INT unsigned int
#endif
#if defined(HEADER_RC2_H) && !defined(RC2_INT)
/* I need to put in a mod for the alpha - eay */
#define RC2_INT unsigned int
#endif
#if defined(HEADER_RC4_H)
#if !defined(RC4_INT)
/* using int types make the structure larger but make the code faster
* on most boxes I have tested - up to %20 faster. */
/*
* I don't know what does "most" mean, but declaring "int" is a must on:
* - Intel P6 because partial register stalls are very expensive;
* - elder Alpha because it lacks byte load/store instructions;
*/
#define RC4_INT unsigned int
#endif
#if !defined(RC4_CHUNK)
/*
* This enables code handling data aligned at natural CPU word
* boundary. See crypto/rc4/rc4_enc.c for further details.
*/
#undef RC4_CHUNK
#endif
#endif
#if (defined(HEADER_NEW_DES_H) || defined(HEADER_DES_H)) && !defined(DES_LONG)
/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a
* %20 speed up (longs are 8 bytes, int's are 4). */
#ifndef DES_LONG
#define DES_LONG unsigned long
#endif
#endif
#if defined(HEADER_BN_H) && !defined(CONFIG_HEADER_BN_H)
#define CONFIG_HEADER_BN_H
#undef BN_LLONG
/* Should we define BN_DIV2W here? */
/* Only one for the following should be defined */
#undef SIXTY_FOUR_BIT_LONG
#undef SIXTY_FOUR_BIT
#define THIRTY_TWO_BIT
#endif
#if defined(HEADER_RC4_LOCL_H) && !defined(CONFIG_HEADER_RC4_LOCL_H)
#define CONFIG_HEADER_RC4_LOCL_H
/* if this is defined data[i] is used instead of *data, this is a %20
* speedup on x86 */
#undef RC4_INDEX
#endif
#if defined(HEADER_BF_LOCL_H) && !defined(CONFIG_HEADER_BF_LOCL_H)
#define CONFIG_HEADER_BF_LOCL_H
#undef BF_PTR
#endif /* HEADER_BF_LOCL_H */
#if defined(HEADER_DES_LOCL_H) && !defined(CONFIG_HEADER_DES_LOCL_H)
#define CONFIG_HEADER_DES_LOCL_H
#ifndef DES_DEFAULT_OPTIONS
/* the following is tweaked from a config script, that is why it is a
* protected undef/define */
#ifndef DES_PTR
#undef DES_PTR
#endif
/* This helps C compiler generate the correct code for multiple functional
* units. It reduces register dependancies at the expense of 2 more
* registers */
#ifndef DES_RISC1
#undef DES_RISC1
#endif
#ifndef DES_RISC2
#undef DES_RISC2
#endif
#if defined(DES_RISC1) && defined(DES_RISC2)
YOU SHOULD NOT HAVE BOTH DES_RISC1 AND DES_RISC2 DEFINED!!!!!
#endif
/* Unroll the inner loop, this sometimes helps, sometimes hinders.
* Very mucy CPU dependant */
#ifndef DES_UNROLL
#undef DES_UNROLL
#endif
/* These default values were supplied by
* Peter Gutman <pgut001@cs.auckland.ac.nz>
* They are only used if nothing else has been defined */
#if !defined(DES_PTR) && !defined(DES_RISC1) && !defined(DES_RISC2) && !defined(DES_UNROLL)
/* Special defines which change the way the code is built depending on the
CPU and OS. For SGI machines you can use _MIPS_SZLONG (32 or 64) to find
even newer MIPS CPU's, but at the moment one size fits all for
optimization options. Older Sparc's work better with only UNROLL, but
there's no way to tell at compile time what it is you're running on */
#if defined( sun ) /* Newer Sparc's */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#elif defined( __ultrix ) /* Older MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined( __osf1__ ) /* Alpha */
# define DES_PTR
# define DES_RISC2
#elif defined ( _AIX ) /* RS6000 */
/* Unknown */
#elif defined( __hpux ) /* HP-PA */
/* Unknown */
#elif defined( __aux ) /* 68K */
/* Unknown */
#elif defined( __dgux ) /* 88K (but P6 in latest boxes) */
# define DES_UNROLL
#elif defined( __sgi ) /* Newer MIPS */
# define DES_PTR
# define DES_RISC2
# define DES_UNROLL
#elif defined(i386) || defined(__i386__) /* x86 boxes, should be gcc */
# define DES_PTR
# define DES_RISC1
# define DES_UNROLL
#endif /* Systems-specific speed defines */
#endif
#endif /* DES_DEFAULT_OPTIONS */
#endif /* HEADER_DES_LOCL_H */
#ifdef __cplusplus
}
#endif

6
deps/openssl/openssl/crypto/opensslv.h

@ -30,11 +30,11 @@ extern "C" {
* (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
* major minor fix final patch/beta) * major minor fix final patch/beta)
*/ */
# define OPENSSL_VERSION_NUMBER 0x1000202fL # define OPENSSL_VERSION_NUMBER 0x1000203fL
# ifdef OPENSSL_FIPS # ifdef OPENSSL_FIPS
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b-fips 11 Jun 2015" # define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2c-fips 12 Jun 2015"
# else # else
# define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2b 11 Jun 2015" # define OPENSSL_VERSION_TEXT "OpenSSL 1.0.2c 12 Jun 2015"
# endif # endif
# define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT # define OPENSSL_VERSION_PTEXT " part of " OPENSSL_VERSION_TEXT

14
deps/openssl/openssl/crypto/perlasm/x86masm.pl

@ -18,10 +18,10 @@ sub ::generic
if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no [] if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/) # no []
{ $opcode="mov"; } { $opcode="mov"; }
elsif ($opcode !~ /mov[dq]$/) elsif ($opcode !~ /movq/)
{ # fix xmm references { # fix xmm references
$arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[-1]=~/\bxmm[0-7]\b/i); $arg[0] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[1]=~/\bxmm[0-7]\b/i);
$arg[-1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i); $arg[1] =~ s/\b[A-Z]+WORD\s+PTR/XMMWORD PTR/i if ($arg[0]=~/\bxmm[0-7]\b/i);
} }
&::emit($opcode,@arg); &::emit($opcode,@arg);
@ -82,7 +82,7 @@ TITLE $_[0].asm
IF \@Version LT 800 IF \@Version LT 800
ECHO MASM version 8.00 or later is strongly recommended. ECHO MASM version 8.00 or later is strongly recommended.
ENDIF ENDIF
.686 .486
.MODEL FLAT .MODEL FLAT
OPTION DOTNAME OPTION DOTNAME
IF \@Version LT 800 IF \@Version LT 800
@ -160,13 +160,13 @@ sub ::public_label
{ push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); } { push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n"); }
sub ::data_byte sub ::data_byte
{ push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_); } { push(@out,("DB\t").join(',',@_)."\n"); }
sub ::data_short sub ::data_short
{ push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_); } { push(@out,("DW\t").join(',',@_)."\n"); }
sub ::data_word sub ::data_word
{ push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_); } { push(@out,("DD\t").join(',',@_)."\n"); }
sub ::align sub ::align
{ push(@out,"ALIGN\t$_[0]\n"); } { push(@out,"ALIGN\t$_[0]\n"); }

1
deps/openssl/openssl/include/openssl/aes.h

@ -1 +0,0 @@
#include "../../crypto/aes/aes.h"

1
deps/openssl/openssl/include/openssl/aes.h

@ -0,0 +1 @@
../../crypto/aes/aes.h

1
deps/openssl/openssl/include/openssl/asn1.h

@ -1 +0,0 @@
#include "../../crypto/asn1/asn1.h"

1
deps/openssl/openssl/include/openssl/asn1.h

@ -0,0 +1 @@
../../crypto/asn1/asn1.h

1
deps/openssl/openssl/include/openssl/asn1_mac.h

@ -1 +0,0 @@
#include "../../crypto/asn1/asn1_mac.h"

1
deps/openssl/openssl/include/openssl/asn1_mac.h

@ -0,0 +1 @@
../../crypto/asn1/asn1_mac.h

1
deps/openssl/openssl/include/openssl/asn1t.h

@ -1 +0,0 @@
#include "../../crypto/asn1/asn1t.h"

1
deps/openssl/openssl/include/openssl/asn1t.h

@ -0,0 +1 @@
../../crypto/asn1/asn1t.h

1
deps/openssl/openssl/include/openssl/bio.h

@ -1 +0,0 @@
#include "../../crypto/bio/bio.h"

1
deps/openssl/openssl/include/openssl/bio.h

@ -0,0 +1 @@
../../crypto/bio/bio.h

1
deps/openssl/openssl/include/openssl/blowfish.h

@ -1 +0,0 @@
#include "../../crypto/bf/blowfish.h"

1
deps/openssl/openssl/include/openssl/blowfish.h

@ -0,0 +1 @@
../../crypto/bf/blowfish.h

1
deps/openssl/openssl/include/openssl/bn.h

@ -1 +0,0 @@
#include "../../crypto/bn/bn.h"

1
deps/openssl/openssl/include/openssl/bn.h

@ -0,0 +1 @@
../../crypto/bn/bn.h

1
deps/openssl/openssl/include/openssl/buffer.h

@ -1 +0,0 @@
#include "../../crypto/buffer/buffer.h"

1
deps/openssl/openssl/include/openssl/buffer.h

@ -0,0 +1 @@
../../crypto/buffer/buffer.h

1
deps/openssl/openssl/include/openssl/camellia.h

@ -1 +0,0 @@
#include "../../crypto/camellia/camellia.h"

1
deps/openssl/openssl/include/openssl/camellia.h

@ -0,0 +1 @@
../../crypto/camellia/camellia.h

1
deps/openssl/openssl/include/openssl/cast.h

@ -1 +0,0 @@
#include "../../crypto/cast/cast.h"

1
deps/openssl/openssl/include/openssl/cast.h

@ -0,0 +1 @@
../../crypto/cast/cast.h

1
deps/openssl/openssl/include/openssl/cmac.h

@ -1 +0,0 @@
#include "../../crypto/cmac/cmac.h"

1
deps/openssl/openssl/include/openssl/cmac.h

@ -0,0 +1 @@
../../crypto/cmac/cmac.h

1
deps/openssl/openssl/include/openssl/cms.h

@ -1 +0,0 @@
#include "../../crypto/cms/cms.h"

1
deps/openssl/openssl/include/openssl/cms.h

@ -0,0 +1 @@
../../crypto/cms/cms.h

1
deps/openssl/openssl/include/openssl/comp.h

@ -1 +0,0 @@
#include "../../crypto/comp/comp.h"

1
deps/openssl/openssl/include/openssl/comp.h

@ -0,0 +1 @@
../../crypto/comp/comp.h

1
deps/openssl/openssl/include/openssl/conf.h

@ -1 +0,0 @@
#include "../../crypto/conf/conf.h"

1
deps/openssl/openssl/include/openssl/conf.h

@ -0,0 +1 @@
../../crypto/conf/conf.h

1
deps/openssl/openssl/include/openssl/conf_api.h

@ -1 +0,0 @@
#include "../../crypto/conf/conf_api.h"

1
deps/openssl/openssl/include/openssl/conf_api.h

@ -0,0 +1 @@
../../crypto/conf/conf_api.h

1
deps/openssl/openssl/include/openssl/crypto.h

@ -1 +0,0 @@
#include "../../crypto/crypto.h"

1
deps/openssl/openssl/include/openssl/crypto.h

@ -0,0 +1 @@
../../crypto/crypto.h

1
deps/openssl/openssl/include/openssl/des.h

@ -1 +0,0 @@
#include "../../crypto/des/des.h"

1
deps/openssl/openssl/include/openssl/des.h

@ -0,0 +1 @@
../../crypto/des/des.h

1
deps/openssl/openssl/include/openssl/des_old.h

@ -1 +0,0 @@
#include "../../crypto/des/des_old.h"

1
deps/openssl/openssl/include/openssl/des_old.h

@ -0,0 +1 @@
../../crypto/des/des_old.h

1
deps/openssl/openssl/include/openssl/dh.h

@ -1 +0,0 @@
#include "../../crypto/dh/dh.h"

1
deps/openssl/openssl/include/openssl/dh.h

@ -0,0 +1 @@
../../crypto/dh/dh.h

1
deps/openssl/openssl/include/openssl/dsa.h

@ -1 +0,0 @@
#include "../../crypto/dsa/dsa.h"

1
deps/openssl/openssl/include/openssl/dsa.h

@ -0,0 +1 @@
../../crypto/dsa/dsa.h

1
deps/openssl/openssl/include/openssl/dso.h

@ -1 +0,0 @@
#include "../../crypto/dso/dso.h"

1
deps/openssl/openssl/include/openssl/dso.h

@ -0,0 +1 @@
../../crypto/dso/dso.h

1
deps/openssl/openssl/include/openssl/dtls1.h

@ -1 +0,0 @@
#include "../../ssl/dtls1.h"

1
deps/openssl/openssl/include/openssl/dtls1.h

@ -0,0 +1 @@
../../ssl/dtls1.h

1
deps/openssl/openssl/include/openssl/e_os2.h

@ -1 +0,0 @@
#include "../../e_os2.h"

1
deps/openssl/openssl/include/openssl/e_os2.h

@ -0,0 +1 @@
../../e_os2.h

1
deps/openssl/openssl/include/openssl/ebcdic.h

@ -1 +0,0 @@
#include "../../crypto/ebcdic.h"

1
deps/openssl/openssl/include/openssl/ebcdic.h

@ -0,0 +1 @@
../../crypto/ebcdic.h

1
deps/openssl/openssl/include/openssl/ec.h

@ -1 +0,0 @@
#include "../../crypto/ec/ec.h"

1
deps/openssl/openssl/include/openssl/ec.h

@ -0,0 +1 @@
../../crypto/ec/ec.h

1
deps/openssl/openssl/include/openssl/ecdh.h

@ -1 +0,0 @@
#include "../../crypto/ecdh/ecdh.h"

1
deps/openssl/openssl/include/openssl/ecdh.h

@ -0,0 +1 @@
../../crypto/ecdh/ecdh.h

1
deps/openssl/openssl/include/openssl/ecdsa.h

@ -1 +0,0 @@
#include "../../crypto/ecdsa/ecdsa.h"

1
deps/openssl/openssl/include/openssl/ecdsa.h

@ -0,0 +1 @@
../../crypto/ecdsa/ecdsa.h

1
deps/openssl/openssl/include/openssl/engine.h

@ -1 +0,0 @@
#include "../../crypto/engine/engine.h"

1
deps/openssl/openssl/include/openssl/engine.h

@ -0,0 +1 @@
../../crypto/engine/engine.h

1
deps/openssl/openssl/include/openssl/err.h

@ -1 +0,0 @@
#include "../../crypto/err/err.h"

1
deps/openssl/openssl/include/openssl/err.h

@ -0,0 +1 @@
../../crypto/err/err.h

1
deps/openssl/openssl/include/openssl/evp.h

@ -1 +0,0 @@
#include "../../crypto/evp/evp.h"

1
deps/openssl/openssl/include/openssl/evp.h

@ -0,0 +1 @@
../../crypto/evp/evp.h

1
deps/openssl/openssl/include/openssl/hmac.h

@ -1 +0,0 @@
#include "../../crypto/hmac/hmac.h"

1
deps/openssl/openssl/include/openssl/hmac.h

@ -0,0 +1 @@
../../crypto/hmac/hmac.h

1
deps/openssl/openssl/include/openssl/idea.h

@ -1 +0,0 @@
#include "../../crypto/idea/idea.h"

1
deps/openssl/openssl/include/openssl/idea.h

@ -0,0 +1 @@
../../crypto/idea/idea.h

1
deps/openssl/openssl/include/openssl/krb5_asn.h

@ -1 +0,0 @@
#include "../../crypto/krb5/krb5_asn.h"

1
deps/openssl/openssl/include/openssl/krb5_asn.h

@ -0,0 +1 @@
../../crypto/krb5/krb5_asn.h

1
deps/openssl/openssl/include/openssl/kssl.h

@ -1 +0,0 @@
#include "../../ssl/kssl.h"

1
deps/openssl/openssl/include/openssl/kssl.h

@ -0,0 +1 @@
../../ssl/kssl.h

1
deps/openssl/openssl/include/openssl/lhash.h

@ -1 +0,0 @@
#include "../../crypto/lhash/lhash.h"

1
deps/openssl/openssl/include/openssl/lhash.h

@ -0,0 +1 @@
../../crypto/lhash/lhash.h

1
deps/openssl/openssl/include/openssl/md4.h

@ -1 +0,0 @@
#include "../../crypto/md4/md4.h"

1
deps/openssl/openssl/include/openssl/md4.h

@ -0,0 +1 @@
../../crypto/md4/md4.h

1
deps/openssl/openssl/include/openssl/md5.h

@ -1 +0,0 @@
#include "../../crypto/md5/md5.h"

1
deps/openssl/openssl/include/openssl/md5.h

@ -0,0 +1 @@
../../crypto/md5/md5.h

1
deps/openssl/openssl/include/openssl/mdc2.h

@ -1 +0,0 @@
#include "../../crypto/mdc2/mdc2.h"

1
deps/openssl/openssl/include/openssl/mdc2.h

@ -0,0 +1 @@
../../crypto/mdc2/mdc2.h

1
deps/openssl/openssl/include/openssl/modes.h

@ -1 +0,0 @@
#include "../../crypto/modes/modes.h"

1
deps/openssl/openssl/include/openssl/modes.h

@ -0,0 +1 @@
../../crypto/modes/modes.h

1
deps/openssl/openssl/include/openssl/obj_mac.h

@ -1 +0,0 @@
#include "../../crypto/objects/obj_mac.h"

1
deps/openssl/openssl/include/openssl/obj_mac.h

@ -0,0 +1 @@
../../crypto/objects/obj_mac.h

1
deps/openssl/openssl/include/openssl/objects.h

@ -1 +0,0 @@
#include "../../crypto/objects/objects.h"

1
deps/openssl/openssl/include/openssl/objects.h

@ -0,0 +1 @@
../../crypto/objects/objects.h

1
deps/openssl/openssl/include/openssl/ocsp.h

@ -1 +0,0 @@
#include "../../crypto/ocsp/ocsp.h"

1
deps/openssl/openssl/include/openssl/ocsp.h

@ -0,0 +1 @@
../../crypto/ocsp/ocsp.h

1
deps/openssl/openssl/include/openssl/opensslconf.h

@ -1 +0,0 @@
#include "../../crypto/opensslconf.h"

1
deps/openssl/openssl/include/openssl/opensslconf.h

@ -0,0 +1 @@
../../crypto/opensslconf.h

1
deps/openssl/openssl/include/openssl/opensslv.h

@ -1 +0,0 @@
#include "../../crypto/opensslv.h"

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save