From e548abb80024ef71273e3c6a671ee2e726ea5121 Mon Sep 17 00:00:00 2001
From: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Date: Sat, 13 Jun 2015 00:56:07 +0900
Subject: [PATCH] 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>
---
 deps/openssl/openssl/CHANGES                  |   6 +
 deps/openssl/openssl/Makefile                 |   2 +-
 deps/openssl/openssl/Makefile.bak             |   2 +-
 deps/openssl/openssl/NEWS                     |   4 +
 deps/openssl/openssl/README                   |   2 +-
 deps/openssl/openssl/apps/app_rand.c          |  14 +-
 deps/openssl/openssl/apps/s_client.c          |  31 +--
 deps/openssl/openssl/crypto/hmac/hmac.c       |  19 +-
 deps/openssl/openssl/crypto/hmac/hmac.h       |   1 -
 deps/openssl/openssl/crypto/hmac/hmactest.c   |   7 +-
 deps/openssl/openssl/crypto/opensslconf.h     | 254 +++++++++++++++++-
 deps/openssl/openssl/crypto/opensslv.h        |   6 +-
 .../openssl/openssl/crypto/perlasm/x86masm.pl |  14 +-
 deps/openssl/openssl/include/openssl/aes.h    |   2 +-
 deps/openssl/openssl/include/openssl/asn1.h   |   2 +-
 .../openssl/include/openssl/asn1_mac.h        |   2 +-
 deps/openssl/openssl/include/openssl/asn1t.h  |   2 +-
 deps/openssl/openssl/include/openssl/bio.h    |   2 +-
 .../openssl/include/openssl/blowfish.h        |   2 +-
 deps/openssl/openssl/include/openssl/bn.h     |   2 +-
 deps/openssl/openssl/include/openssl/buffer.h |   2 +-
 .../openssl/include/openssl/camellia.h        |   2 +-
 deps/openssl/openssl/include/openssl/cast.h   |   2 +-
 deps/openssl/openssl/include/openssl/cmac.h   |   2 +-
 deps/openssl/openssl/include/openssl/cms.h    |   2 +-
 deps/openssl/openssl/include/openssl/comp.h   |   2 +-
 deps/openssl/openssl/include/openssl/conf.h   |   2 +-
 .../openssl/include/openssl/conf_api.h        |   2 +-
 deps/openssl/openssl/include/openssl/crypto.h |   2 +-
 deps/openssl/openssl/include/openssl/des.h    |   2 +-
 .../openssl/openssl/include/openssl/des_old.h |   2 +-
 deps/openssl/openssl/include/openssl/dh.h     |   2 +-
 deps/openssl/openssl/include/openssl/dsa.h    |   2 +-
 deps/openssl/openssl/include/openssl/dso.h    |   2 +-
 deps/openssl/openssl/include/openssl/dtls1.h  |   2 +-
 deps/openssl/openssl/include/openssl/e_os2.h  |   2 +-
 deps/openssl/openssl/include/openssl/ebcdic.h |   2 +-
 deps/openssl/openssl/include/openssl/ec.h     |   2 +-
 deps/openssl/openssl/include/openssl/ecdh.h   |   2 +-
 deps/openssl/openssl/include/openssl/ecdsa.h  |   2 +-
 deps/openssl/openssl/include/openssl/engine.h |   2 +-
 deps/openssl/openssl/include/openssl/err.h    |   2 +-
 deps/openssl/openssl/include/openssl/evp.h    |   2 +-
 deps/openssl/openssl/include/openssl/hmac.h   |   2 +-
 deps/openssl/openssl/include/openssl/idea.h   |   2 +-
 .../openssl/include/openssl/krb5_asn.h        |   2 +-
 deps/openssl/openssl/include/openssl/kssl.h   |   2 +-
 deps/openssl/openssl/include/openssl/lhash.h  |   2 +-
 deps/openssl/openssl/include/openssl/md4.h    |   2 +-
 deps/openssl/openssl/include/openssl/md5.h    |   2 +-
 deps/openssl/openssl/include/openssl/mdc2.h   |   2 +-
 deps/openssl/openssl/include/openssl/modes.h  |   2 +-
 .../openssl/openssl/include/openssl/obj_mac.h |   2 +-
 .../openssl/openssl/include/openssl/objects.h |   2 +-
 deps/openssl/openssl/include/openssl/ocsp.h   |   2 +-
 .../openssl/include/openssl/opensslconf.h     |   2 +-
 .../openssl/include/openssl/opensslv.h        |   2 +-
 .../openssl/include/openssl/ossl_typ.h        |   2 +-
 deps/openssl/openssl/include/openssl/pem.h    |   2 +-
 deps/openssl/openssl/include/openssl/pem2.h   |   2 +-
 deps/openssl/openssl/include/openssl/pkcs12.h |   2 +-
 deps/openssl/openssl/include/openssl/pkcs7.h  |   2 +-
 deps/openssl/openssl/include/openssl/pqueue.h |   2 +-
 deps/openssl/openssl/include/openssl/rand.h   |   2 +-
 deps/openssl/openssl/include/openssl/rc2.h    |   2 +-
 deps/openssl/openssl/include/openssl/rc4.h    |   2 +-
 deps/openssl/openssl/include/openssl/ripemd.h |   2 +-
 deps/openssl/openssl/include/openssl/rsa.h    |   2 +-
 .../openssl/include/openssl/safestack.h       |   2 +-
 deps/openssl/openssl/include/openssl/seed.h   |   2 +-
 deps/openssl/openssl/include/openssl/sha.h    |   2 +-
 deps/openssl/openssl/include/openssl/srp.h    |   2 +-
 deps/openssl/openssl/include/openssl/srtp.h   |   2 +-
 deps/openssl/openssl/include/openssl/ssl.h    |   2 +-
 deps/openssl/openssl/include/openssl/ssl2.h   |   2 +-
 deps/openssl/openssl/include/openssl/ssl23.h  |   2 +-
 deps/openssl/openssl/include/openssl/ssl3.h   |   2 +-
 deps/openssl/openssl/include/openssl/stack.h  |   2 +-
 .../openssl/include/openssl/symhacks.h        |   2 +-
 deps/openssl/openssl/include/openssl/tls1.h   |   2 +-
 deps/openssl/openssl/include/openssl/ts.h     |   2 +-
 deps/openssl/openssl/include/openssl/txt_db.h |   2 +-
 deps/openssl/openssl/include/openssl/ui.h     |   2 +-
 .../openssl/include/openssl/ui_compat.h       |   2 +-
 .../openssl/include/openssl/whrlpool.h        |   2 +-
 deps/openssl/openssl/include/openssl/x509.h   |   2 +-
 .../openssl/include/openssl/x509_vfy.h        |   2 +-
 deps/openssl/openssl/include/openssl/x509v3.h |   2 +-
 deps/openssl/openssl/openssl.spec             |   2 +-
 deps/openssl/openssl/ssl/t1_lib.c             |  12 +-
 90 files changed, 383 insertions(+), 143 deletions(-)
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/aes.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/asn1.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/asn1_mac.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/asn1t.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/bio.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/blowfish.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/bn.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/buffer.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/camellia.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/cast.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/cmac.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/cms.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/comp.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/conf.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/conf_api.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/crypto.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/des.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/des_old.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/dh.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/dsa.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/dso.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/dtls1.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/e_os2.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ebcdic.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ec.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ecdh.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ecdsa.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/engine.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/err.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/evp.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/hmac.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/idea.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/krb5_asn.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/kssl.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/lhash.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/md4.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/md5.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/mdc2.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/modes.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/obj_mac.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/objects.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ocsp.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/opensslconf.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/opensslv.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ossl_typ.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/pem.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/pem2.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/pkcs12.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/pkcs7.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/pqueue.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/rand.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/rc2.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/rc4.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ripemd.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/rsa.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/safestack.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/seed.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/sha.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/srp.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/srtp.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ssl.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ssl2.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ssl23.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ssl3.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/stack.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/symhacks.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/tls1.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ts.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/txt_db.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ui.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/ui_compat.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/whrlpool.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/x509.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/x509_vfy.h
 mode change 100644 => 120000 deps/openssl/openssl/include/openssl/x509v3.h

diff --git a/deps/openssl/openssl/CHANGES b/deps/openssl/openssl/CHANGES
index 84e076411be153..4cbf61ddf6b4ef 100644
--- a/deps/openssl/openssl/CHANGES
+++ b/deps/openssl/openssl/CHANGES
@@ -2,6 +2,12 @@
  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]
 
   *) Malformed ECParameters causes infinite loop
diff --git a/deps/openssl/openssl/Makefile b/deps/openssl/openssl/Makefile
index 271bef164349d6..56b43c600e0363 100644
--- a/deps/openssl/openssl/Makefile
+++ b/deps/openssl/openssl/Makefile
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.2b
+VERSION=1.0.2c
 MAJOR=1
 MINOR=0.2
 SHLIB_VERSION_NUMBER=1.0.0
diff --git a/deps/openssl/openssl/Makefile.bak b/deps/openssl/openssl/Makefile.bak
index 71c8d9fc6cd98a..8f9fd251aa3593 100644
--- a/deps/openssl/openssl/Makefile.bak
+++ b/deps/openssl/openssl/Makefile.bak
@@ -4,7 +4,7 @@
 ## Makefile for OpenSSL
 ##
 
-VERSION=1.0.2b-dev
+VERSION=1.0.2c-dev
 MAJOR=1
 MINOR=0.2
 SHLIB_VERSION_NUMBER=1.0.0
diff --git a/deps/openssl/openssl/NEWS b/deps/openssl/openssl/NEWS
index e6147935b28f89..f3574cf4c40060 100644
--- a/deps/openssl/openssl/NEWS
+++ b/deps/openssl/openssl/NEWS
@@ -5,6 +5,10 @@
   This file gives a brief overview of the major changes between each OpenSSL
   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]
 
       o Malformed ECParameters causes infinite loop (CVE-2015-1788)
diff --git a/deps/openssl/openssl/README b/deps/openssl/openssl/README
index 8de5c74d8ed46c..ae0443199c953a 100644
--- a/deps/openssl/openssl/README
+++ b/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) 1995-1998 Eric A. Young, Tim J. Hudson
diff --git a/deps/openssl/openssl/apps/app_rand.c b/deps/openssl/openssl/apps/app_rand.c
index b6fe294a682711..595fc7821c85e6 100644
--- a/deps/openssl/openssl/apps/app_rand.c
+++ b/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];
 
 #ifdef OPENSSL_SYS_WINDOWS
-    /*
-     * allocate 2 to dont_warn not to use RAND_screen() via
-     * -no_rand_screen option in s_client
-     */
-    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");
-    }
+    BIO_printf(bio_e, "Loading 'screen' into random state -");
+    BIO_flush(bio_e);
+    RAND_screen();
+    BIO_printf(bio_e, " done\n");
 #endif
 
     if (file == NULL)
diff --git a/deps/openssl/openssl/apps/s_client.c b/deps/openssl/openssl/apps/s_client.c
index d89f2c51066574..e55f2c5abc88b7 100644
--- a/deps/openssl/openssl/apps/s_client.c
+++ b/deps/openssl/openssl/apps/s_client.c
@@ -180,13 +180,6 @@ typedef unsigned int u_int;
 # include <fcntl.h>
 #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
 #define PROG    s_client_main
 
@@ -236,7 +229,6 @@ static BIO *bio_c_msg = NULL;
 static int c_quiet = 0;
 static int c_ign_eof = 0;
 static int c_brief = 0;
-static int c_no_rand_screen = 0;
 
 #ifndef OPENSSL_NO_PSK
 /* Default PSK identity and key */
@@ -449,10 +441,6 @@ static void sc_usage(void)
                " -keymatexport label   - Export keying material using label\n");
     BIO_printf(bio_err,
                " -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
@@ -1132,10 +1120,6 @@ int MAIN(int argc, char **argv)
             keymatexportlen = atoi(*(++argv));
             if (keymatexportlen == 0)
                 goto bad;
-#ifdef OPENSSL_SYS_WINDOWS
-        } else if (strcmp(*argv, "-no_rand_screen") == 0) {
-          c_no_rand_screen = 1;
-#endif
         } else {
             BIO_printf(bio_err, "unknown option %s\n", *argv);
             badop = 1;
@@ -1241,7 +1225,7 @@ int MAIN(int argc, char **argv)
     if (!load_excert(&exc, bio_err))
         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()) {
         BIO_printf(bio_err,
                    "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;
                     i = select(width, (void *)&readfds, (void *)&writefds,
                                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())
                                  || (WAIT_OBJECT_0 ==
                                      WaitForSingleObject(GetStdHandle
@@ -1782,8 +1769,6 @@ int MAIN(int argc, char **argv)
                                                          0)))
                                || !read_tty))
                         continue;
-#else
-                    if(!i && (!_kbhit() || !read_tty) ) continue;
 # endif
                 } else
                     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_USE_STD_INPUT_HANDLE)
+# if defined(OPENSSL_SYS_WINCE) || defined(OPENSSL_SYS_MSDOS)
+        else if (_kbhit())
+# else
         else if ((_kbhit())
                  || (WAIT_OBJECT_0 ==
                      WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
-#else
-        else if (_kbhit())
 # endif
 #elif defined (OPENSSL_SYS_NETWARE)
         else if (_kbhit())
diff --git a/deps/openssl/openssl/crypto/hmac/hmac.c b/deps/openssl/openssl/crypto/hmac/hmac.c
index 15a9a21299157d..51a0a3efcd672d 100644
--- a/deps/openssl/openssl/crypto/hmac/hmac.c
+++ b/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);
     }
 #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) {
         reset = 1;
@@ -107,9 +110,6 @@ int HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,
         return 0;
     }
 
-    if (!ctx->key_init && key == NULL)
-        return 0;
-
     if (key != NULL) {
         reset = 1;
         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)
             memset(&ctx->key[ctx->key_length], 0,
                    HMAC_MAX_MD_CBLOCK - ctx->key_length);
-        ctx->key_init = 1;
     }
 
     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)
         return FIPS_hmac_update(ctx, data, len);
 #endif
-    if (!ctx->key_init)
+    if (!ctx->md)
         return 0;
 
     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);
 #endif
 
-    if (!ctx->key_init)
+    if (!ctx->md)
         goto err;
 
     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->o_ctx);
     EVP_MD_CTX_init(&ctx->md_ctx);
-    ctx->key_init = 0;
     ctx->md = NULL;
 }
 
@@ -217,11 +215,8 @@ int HMAC_CTX_copy(HMAC_CTX *dctx, HMAC_CTX *sctx)
         goto err;
     if (!EVP_MD_CTX_copy(&dctx->md_ctx, &sctx->md_ctx))
         goto err;
-    dctx->key_init = sctx->key_init;
-    if (sctx->key_init) {
-        memcpy(dctx->key, sctx->key, HMAC_MAX_MD_CBLOCK);
-        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;
     return 1;
  err:
diff --git a/deps/openssl/openssl/crypto/hmac/hmac.h b/deps/openssl/openssl/crypto/hmac/hmac.h
index f8e9f5e4f3c261..b8b55cda7d73d9 100644
--- a/deps/openssl/openssl/crypto/hmac/hmac.h
+++ b/deps/openssl/openssl/crypto/hmac/hmac.h
@@ -79,7 +79,6 @@ typedef struct hmac_ctx_st {
     EVP_MD_CTX o_ctx;
     unsigned int key_length;
     unsigned char key[HMAC_MAX_MD_CBLOCK];
-    int key_init;
 } HMAC_CTX;
 
 # define HMAC_size(e)    (EVP_MD_size((e)->md))
diff --git a/deps/openssl/openssl/crypto/hmac/hmactest.c b/deps/openssl/openssl/crypto/hmac/hmactest.c
index 86b6c2529fe29c..271d0ebf264c27 100644
--- a/deps/openssl/openssl/crypto/hmac/hmactest.c
+++ b/deps/openssl/openssl/crypto/hmac/hmactest.c
@@ -233,7 +233,12 @@ int main(int argc, char *argv[])
         err++;
         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");
         err++;
         goto test6;
diff --git a/deps/openssl/openssl/crypto/opensslconf.h b/deps/openssl/openssl/crypto/opensslconf.h
index 76c99d433ab886..3b917c6876dee4 100644
--- a/deps/openssl/openssl/crypto/opensslconf.h
+++ b/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
diff --git a/deps/openssl/openssl/crypto/opensslv.h b/deps/openssl/openssl/crypto/opensslv.h
index e6f991cfb82c73..7cc19dc510686f 100644
--- a/deps/openssl/openssl/crypto/opensslv.h
+++ b/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
  *  major minor fix final patch/beta)
  */
-# define OPENSSL_VERSION_NUMBER  0x1000202fL
+# define OPENSSL_VERSION_NUMBER  0x1000203fL
 # 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
-#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2b 11 Jun 2015"
+#  define OPENSSL_VERSION_TEXT    "OpenSSL 1.0.2c 12 Jun 2015"
 # endif
 # define OPENSSL_VERSION_PTEXT   " part of " OPENSSL_VERSION_TEXT
 
diff --git a/deps/openssl/openssl/crypto/perlasm/x86masm.pl b/deps/openssl/openssl/crypto/perlasm/x86masm.pl
index b7f49d1c41dc16..1741342c3af354 100644
--- a/deps/openssl/openssl/crypto/perlasm/x86masm.pl
+++ b/deps/openssl/openssl/crypto/perlasm/x86masm.pl
@@ -18,10 +18,10 @@ sub ::generic
 
     if ($opcode =~ /lea/ && @arg[1] =~ s/.*PTR\s+(\(.*\))$/OFFSET $1/)	# no []
     {	$opcode="mov";	}
-    elsif ($opcode !~ /mov[dq]$/)
+    elsif ($opcode !~ /movq/)
     {	# fix xmm references
-	$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[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);
     }
 
     &::emit($opcode,@arg);
@@ -82,7 +82,7 @@ sub ::file
 IF \@Version LT 800
 ECHO MASM version 8.00 or later is strongly recommended.
 ENDIF
-.686
+.486
 .MODEL	FLAT
 OPTION	DOTNAME
 IF \@Version LT 800
@@ -160,13 +160,13 @@ sub ::public_label
 {   push(@out,"PUBLIC\t".&::LABEL($_[0],$nmdecor.$_[0])."\n");   }
 
 sub ::data_byte
-{   push(@out,("DB\t").join(',',splice(@_,0,16))."\n") while(@_);	}
+{   push(@out,("DB\t").join(',',@_)."\n");	}
 
 sub ::data_short
-{   push(@out,("DW\t").join(',',splice(@_,0,8))."\n") while(@_);	}
+{   push(@out,("DW\t").join(',',@_)."\n");	}
 
 sub ::data_word
-{   push(@out,("DD\t").join(',',splice(@_,0,4))."\n") while(@_);	}
+{   push(@out,("DD\t").join(',',@_)."\n");	}
 
 sub ::align
 {   push(@out,"ALIGN\t$_[0]\n");	}
diff --git a/deps/openssl/openssl/include/openssl/aes.h b/deps/openssl/openssl/include/openssl/aes.h
deleted file mode 100644
index f646d41f060493..00000000000000
--- a/deps/openssl/openssl/include/openssl/aes.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/aes/aes.h"
diff --git a/deps/openssl/openssl/include/openssl/aes.h b/deps/openssl/openssl/include/openssl/aes.h
new file mode 120000
index 00000000000000..f555c13ed7b49f
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/aes.h
@@ -0,0 +1 @@
+../../crypto/aes/aes.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/asn1.h b/deps/openssl/openssl/include/openssl/asn1.h
deleted file mode 100644
index 5432ed8dc83730..00000000000000
--- a/deps/openssl/openssl/include/openssl/asn1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/asn1/asn1.h"
diff --git a/deps/openssl/openssl/include/openssl/asn1.h b/deps/openssl/openssl/include/openssl/asn1.h
new file mode 120000
index 00000000000000..dd514954a1155d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/asn1.h
@@ -0,0 +1 @@
+../../crypto/asn1/asn1.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/asn1_mac.h b/deps/openssl/openssl/include/openssl/asn1_mac.h
deleted file mode 100644
index 214787c4774646..00000000000000
--- a/deps/openssl/openssl/include/openssl/asn1_mac.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/asn1/asn1_mac.h"
diff --git a/deps/openssl/openssl/include/openssl/asn1_mac.h b/deps/openssl/openssl/include/openssl/asn1_mac.h
new file mode 120000
index 00000000000000..97781d99331ba3
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/asn1_mac.h
@@ -0,0 +1 @@
+../../crypto/asn1/asn1_mac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/asn1t.h b/deps/openssl/openssl/include/openssl/asn1t.h
deleted file mode 100644
index 4de87a9c610d26..00000000000000
--- a/deps/openssl/openssl/include/openssl/asn1t.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/asn1/asn1t.h"
diff --git a/deps/openssl/openssl/include/openssl/asn1t.h b/deps/openssl/openssl/include/openssl/asn1t.h
new file mode 120000
index 00000000000000..31c87c38853dac
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/asn1t.h
@@ -0,0 +1 @@
+../../crypto/asn1/asn1t.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/bio.h b/deps/openssl/openssl/include/openssl/bio.h
deleted file mode 100644
index 34f8a2df07eec0..00000000000000
--- a/deps/openssl/openssl/include/openssl/bio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/bio/bio.h"
diff --git a/deps/openssl/openssl/include/openssl/bio.h b/deps/openssl/openssl/include/openssl/bio.h
new file mode 120000
index 00000000000000..c598b6f73a74c1
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/bio.h
@@ -0,0 +1 @@
+../../crypto/bio/bio.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/blowfish.h b/deps/openssl/openssl/include/openssl/blowfish.h
deleted file mode 100644
index 8d515feb0588e5..00000000000000
--- a/deps/openssl/openssl/include/openssl/blowfish.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/bf/blowfish.h"
diff --git a/deps/openssl/openssl/include/openssl/blowfish.h b/deps/openssl/openssl/include/openssl/blowfish.h
new file mode 120000
index 00000000000000..88bf9223423399
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/blowfish.h
@@ -0,0 +1 @@
+../../crypto/bf/blowfish.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/bn.h b/deps/openssl/openssl/include/openssl/bn.h
deleted file mode 100644
index f47d65a93f4935..00000000000000
--- a/deps/openssl/openssl/include/openssl/bn.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/bn/bn.h"
diff --git a/deps/openssl/openssl/include/openssl/bn.h b/deps/openssl/openssl/include/openssl/bn.h
new file mode 120000
index 00000000000000..5c251c135af4d4
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/bn.h
@@ -0,0 +1 @@
+../../crypto/bn/bn.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/buffer.h b/deps/openssl/openssl/include/openssl/buffer.h
deleted file mode 100644
index 1d2c2a2ec1b266..00000000000000
--- a/deps/openssl/openssl/include/openssl/buffer.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/buffer/buffer.h"
diff --git a/deps/openssl/openssl/include/openssl/buffer.h b/deps/openssl/openssl/include/openssl/buffer.h
new file mode 120000
index 00000000000000..76ea7114a2b457
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/buffer.h
@@ -0,0 +1 @@
+../../crypto/buffer/buffer.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/camellia.h b/deps/openssl/openssl/include/openssl/camellia.h
deleted file mode 100644
index 5a0a141eed5783..00000000000000
--- a/deps/openssl/openssl/include/openssl/camellia.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/camellia/camellia.h"
diff --git a/deps/openssl/openssl/include/openssl/camellia.h b/deps/openssl/openssl/include/openssl/camellia.h
new file mode 120000
index 00000000000000..ad10f9792b6bb2
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/camellia.h
@@ -0,0 +1 @@
+../../crypto/camellia/camellia.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/cast.h b/deps/openssl/openssl/include/openssl/cast.h
deleted file mode 100644
index 12cf92c4a9b614..00000000000000
--- a/deps/openssl/openssl/include/openssl/cast.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/cast/cast.h"
diff --git a/deps/openssl/openssl/include/openssl/cast.h b/deps/openssl/openssl/include/openssl/cast.h
new file mode 120000
index 00000000000000..b775ab04b8144a
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/cast.h
@@ -0,0 +1 @@
+../../crypto/cast/cast.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/cmac.h b/deps/openssl/openssl/include/openssl/cmac.h
deleted file mode 100644
index a7579aeabdd0f7..00000000000000
--- a/deps/openssl/openssl/include/openssl/cmac.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/cmac/cmac.h"
diff --git a/deps/openssl/openssl/include/openssl/cmac.h b/deps/openssl/openssl/include/openssl/cmac.h
new file mode 120000
index 00000000000000..bfb70c468304ae
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/cmac.h
@@ -0,0 +1 @@
+../../crypto/cmac/cmac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/cms.h b/deps/openssl/openssl/include/openssl/cms.h
deleted file mode 100644
index 8687c7fe467ff9..00000000000000
--- a/deps/openssl/openssl/include/openssl/cms.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/cms/cms.h"
diff --git a/deps/openssl/openssl/include/openssl/cms.h b/deps/openssl/openssl/include/openssl/cms.h
new file mode 120000
index 00000000000000..0f651adde2c0e2
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/cms.h
@@ -0,0 +1 @@
+../../crypto/cms/cms.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/comp.h b/deps/openssl/openssl/include/openssl/comp.h
deleted file mode 100644
index d14e36cc36b816..00000000000000
--- a/deps/openssl/openssl/include/openssl/comp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/comp/comp.h"
diff --git a/deps/openssl/openssl/include/openssl/comp.h b/deps/openssl/openssl/include/openssl/comp.h
new file mode 120000
index 00000000000000..712c9d4ae58c94
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/comp.h
@@ -0,0 +1 @@
+../../crypto/comp/comp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/conf.h b/deps/openssl/openssl/include/openssl/conf.h
deleted file mode 100644
index 3882c82f8d065d..00000000000000
--- a/deps/openssl/openssl/include/openssl/conf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/conf/conf.h"
diff --git a/deps/openssl/openssl/include/openssl/conf.h b/deps/openssl/openssl/include/openssl/conf.h
new file mode 120000
index 00000000000000..44156b189b096a
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/conf.h
@@ -0,0 +1 @@
+../../crypto/conf/conf.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/conf_api.h b/deps/openssl/openssl/include/openssl/conf_api.h
deleted file mode 100644
index 03933578574da9..00000000000000
--- a/deps/openssl/openssl/include/openssl/conf_api.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/conf/conf_api.h"
diff --git a/deps/openssl/openssl/include/openssl/conf_api.h b/deps/openssl/openssl/include/openssl/conf_api.h
new file mode 120000
index 00000000000000..26b42198a86af6
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/conf_api.h
@@ -0,0 +1 @@
+../../crypto/conf/conf_api.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/crypto.h b/deps/openssl/openssl/include/openssl/crypto.h
deleted file mode 100644
index 7e3d91e42f06da..00000000000000
--- a/deps/openssl/openssl/include/openssl/crypto.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/crypto.h"
diff --git a/deps/openssl/openssl/include/openssl/crypto.h b/deps/openssl/openssl/include/openssl/crypto.h
new file mode 120000
index 00000000000000..2f3f63cb016cd9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/crypto.h
@@ -0,0 +1 @@
+../../crypto/crypto.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/des.h b/deps/openssl/openssl/include/openssl/des.h
deleted file mode 100644
index 1d6631e9b6a2c8..00000000000000
--- a/deps/openssl/openssl/include/openssl/des.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/des/des.h"
diff --git a/deps/openssl/openssl/include/openssl/des.h b/deps/openssl/openssl/include/openssl/des.h
new file mode 120000
index 00000000000000..5eb7c88b38a1ad
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/des.h
@@ -0,0 +1 @@
+../../crypto/des/des.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/des_old.h b/deps/openssl/openssl/include/openssl/des_old.h
deleted file mode 100644
index e5828733cca68e..00000000000000
--- a/deps/openssl/openssl/include/openssl/des_old.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/des/des_old.h"
diff --git a/deps/openssl/openssl/include/openssl/des_old.h b/deps/openssl/openssl/include/openssl/des_old.h
new file mode 120000
index 00000000000000..970989880523ec
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/des_old.h
@@ -0,0 +1 @@
+../../crypto/des/des_old.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dh.h b/deps/openssl/openssl/include/openssl/dh.h
deleted file mode 100644
index f70a767ac90de1..00000000000000
--- a/deps/openssl/openssl/include/openssl/dh.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/dh/dh.h"
diff --git a/deps/openssl/openssl/include/openssl/dh.h b/deps/openssl/openssl/include/openssl/dh.h
new file mode 120000
index 00000000000000..c0eacb5eb352f9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dh.h
@@ -0,0 +1 @@
+../../crypto/dh/dh.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dsa.h b/deps/openssl/openssl/include/openssl/dsa.h
deleted file mode 100644
index 0365acfe665be6..00000000000000
--- a/deps/openssl/openssl/include/openssl/dsa.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/dsa/dsa.h"
diff --git a/deps/openssl/openssl/include/openssl/dsa.h b/deps/openssl/openssl/include/openssl/dsa.h
new file mode 120000
index 00000000000000..ad4695f9b6ae86
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dsa.h
@@ -0,0 +1 @@
+../../crypto/dsa/dsa.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dso.h b/deps/openssl/openssl/include/openssl/dso.h
deleted file mode 100644
index f3c8de23065971..00000000000000
--- a/deps/openssl/openssl/include/openssl/dso.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/dso/dso.h"
diff --git a/deps/openssl/openssl/include/openssl/dso.h b/deps/openssl/openssl/include/openssl/dso.h
new file mode 120000
index 00000000000000..b1f215dafc8997
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dso.h
@@ -0,0 +1 @@
+../../crypto/dso/dso.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/dtls1.h b/deps/openssl/openssl/include/openssl/dtls1.h
deleted file mode 100644
index ac8ab57453cb53..00000000000000
--- a/deps/openssl/openssl/include/openssl/dtls1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/dtls1.h"
diff --git a/deps/openssl/openssl/include/openssl/dtls1.h b/deps/openssl/openssl/include/openssl/dtls1.h
new file mode 120000
index 00000000000000..95aef9913ab0f6
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/dtls1.h
@@ -0,0 +1 @@
+../../ssl/dtls1.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/e_os2.h b/deps/openssl/openssl/include/openssl/e_os2.h
deleted file mode 100644
index ab3f1ee44f4ec2..00000000000000
--- a/deps/openssl/openssl/include/openssl/e_os2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../e_os2.h"
diff --git a/deps/openssl/openssl/include/openssl/e_os2.h b/deps/openssl/openssl/include/openssl/e_os2.h
new file mode 120000
index 00000000000000..0e8c03992489f9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/e_os2.h
@@ -0,0 +1 @@
+../../e_os2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ebcdic.h b/deps/openssl/openssl/include/openssl/ebcdic.h
deleted file mode 100644
index 6dedc7051d2262..00000000000000
--- a/deps/openssl/openssl/include/openssl/ebcdic.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ebcdic.h"
diff --git a/deps/openssl/openssl/include/openssl/ebcdic.h b/deps/openssl/openssl/include/openssl/ebcdic.h
new file mode 120000
index 00000000000000..a7ee60e0aeef49
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ebcdic.h
@@ -0,0 +1 @@
+../../crypto/ebcdic.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ec.h b/deps/openssl/openssl/include/openssl/ec.h
deleted file mode 100644
index 7d2061452608a7..00000000000000
--- a/deps/openssl/openssl/include/openssl/ec.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ec/ec.h"
diff --git a/deps/openssl/openssl/include/openssl/ec.h b/deps/openssl/openssl/include/openssl/ec.h
new file mode 120000
index 00000000000000..245497eda7c065
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ec.h
@@ -0,0 +1 @@
+../../crypto/ec/ec.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ecdh.h b/deps/openssl/openssl/include/openssl/ecdh.h
deleted file mode 100644
index ad6e3dc9c7e133..00000000000000
--- a/deps/openssl/openssl/include/openssl/ecdh.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ecdh/ecdh.h"
diff --git a/deps/openssl/openssl/include/openssl/ecdh.h b/deps/openssl/openssl/include/openssl/ecdh.h
new file mode 120000
index 00000000000000..3fd1c3ba39fd13
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ecdh.h
@@ -0,0 +1 @@
+../../crypto/ecdh/ecdh.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ecdsa.h b/deps/openssl/openssl/include/openssl/ecdsa.h
deleted file mode 100644
index da451230932bef..00000000000000
--- a/deps/openssl/openssl/include/openssl/ecdsa.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ecdsa/ecdsa.h"
diff --git a/deps/openssl/openssl/include/openssl/ecdsa.h b/deps/openssl/openssl/include/openssl/ecdsa.h
new file mode 120000
index 00000000000000..e48acc669ce0c1
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ecdsa.h
@@ -0,0 +1 @@
+../../crypto/ecdsa/ecdsa.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/engine.h b/deps/openssl/openssl/include/openssl/engine.h
deleted file mode 100644
index 2dceaac6c785e9..00000000000000
--- a/deps/openssl/openssl/include/openssl/engine.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/engine/engine.h"
diff --git a/deps/openssl/openssl/include/openssl/engine.h b/deps/openssl/openssl/include/openssl/engine.h
new file mode 120000
index 00000000000000..a02073e32aad74
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/engine.h
@@ -0,0 +1 @@
+../../crypto/engine/engine.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/err.h b/deps/openssl/openssl/include/openssl/err.h
deleted file mode 100644
index caf89a936cd426..00000000000000
--- a/deps/openssl/openssl/include/openssl/err.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/err/err.h"
diff --git a/deps/openssl/openssl/include/openssl/err.h b/deps/openssl/openssl/include/openssl/err.h
new file mode 120000
index 00000000000000..20f65bd9c8c7cd
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/err.h
@@ -0,0 +1 @@
+../../crypto/err/err.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/evp.h b/deps/openssl/openssl/include/openssl/evp.h
deleted file mode 100644
index dd7bcda8f3c8c4..00000000000000
--- a/deps/openssl/openssl/include/openssl/evp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/evp/evp.h"
diff --git a/deps/openssl/openssl/include/openssl/evp.h b/deps/openssl/openssl/include/openssl/evp.h
new file mode 120000
index 00000000000000..7e3a904ae95a7c
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/evp.h
@@ -0,0 +1 @@
+../../crypto/evp/evp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/hmac.h b/deps/openssl/openssl/include/openssl/hmac.h
deleted file mode 100644
index 202128bf52caeb..00000000000000
--- a/deps/openssl/openssl/include/openssl/hmac.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/hmac/hmac.h"
diff --git a/deps/openssl/openssl/include/openssl/hmac.h b/deps/openssl/openssl/include/openssl/hmac.h
new file mode 120000
index 00000000000000..de19ba7ede0c22
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/hmac.h
@@ -0,0 +1 @@
+../../crypto/hmac/hmac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/idea.h b/deps/openssl/openssl/include/openssl/idea.h
deleted file mode 100644
index bdf697d6805d85..00000000000000
--- a/deps/openssl/openssl/include/openssl/idea.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/idea/idea.h"
diff --git a/deps/openssl/openssl/include/openssl/idea.h b/deps/openssl/openssl/include/openssl/idea.h
new file mode 120000
index 00000000000000..724fa345811368
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/idea.h
@@ -0,0 +1 @@
+../../crypto/idea/idea.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/krb5_asn.h b/deps/openssl/openssl/include/openssl/krb5_asn.h
deleted file mode 100644
index 0d3feea281f1da..00000000000000
--- a/deps/openssl/openssl/include/openssl/krb5_asn.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/krb5/krb5_asn.h"
diff --git a/deps/openssl/openssl/include/openssl/krb5_asn.h b/deps/openssl/openssl/include/openssl/krb5_asn.h
new file mode 120000
index 00000000000000..1172e522e4feb9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/krb5_asn.h
@@ -0,0 +1 @@
+../../crypto/krb5/krb5_asn.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/kssl.h b/deps/openssl/openssl/include/openssl/kssl.h
deleted file mode 100644
index 719634aad90ff9..00000000000000
--- a/deps/openssl/openssl/include/openssl/kssl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/kssl.h"
diff --git a/deps/openssl/openssl/include/openssl/kssl.h b/deps/openssl/openssl/include/openssl/kssl.h
new file mode 120000
index 00000000000000..2e5c2cd4dcbb05
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/kssl.h
@@ -0,0 +1 @@
+../../ssl/kssl.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/lhash.h b/deps/openssl/openssl/include/openssl/lhash.h
deleted file mode 100644
index 2d3db87cd5de9a..00000000000000
--- a/deps/openssl/openssl/include/openssl/lhash.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/lhash/lhash.h"
diff --git a/deps/openssl/openssl/include/openssl/lhash.h b/deps/openssl/openssl/include/openssl/lhash.h
new file mode 120000
index 00000000000000..56eb09918c79c6
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/lhash.h
@@ -0,0 +1 @@
+../../crypto/lhash/lhash.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/md4.h b/deps/openssl/openssl/include/openssl/md4.h
deleted file mode 100644
index 611806e5eafb1d..00000000000000
--- a/deps/openssl/openssl/include/openssl/md4.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/md4/md4.h"
diff --git a/deps/openssl/openssl/include/openssl/md4.h b/deps/openssl/openssl/include/openssl/md4.h
new file mode 120000
index 00000000000000..4ff863e7fc9292
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/md4.h
@@ -0,0 +1 @@
+../../crypto/md4/md4.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/md5.h b/deps/openssl/openssl/include/openssl/md5.h
deleted file mode 100644
index aa8cd0bf863be7..00000000000000
--- a/deps/openssl/openssl/include/openssl/md5.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/md5/md5.h"
diff --git a/deps/openssl/openssl/include/openssl/md5.h b/deps/openssl/openssl/include/openssl/md5.h
new file mode 120000
index 00000000000000..26fa47eb5ce7cb
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/md5.h
@@ -0,0 +1 @@
+../../crypto/md5/md5.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/mdc2.h b/deps/openssl/openssl/include/openssl/mdc2.h
deleted file mode 100644
index ac284a179a0484..00000000000000
--- a/deps/openssl/openssl/include/openssl/mdc2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/mdc2/mdc2.h"
diff --git a/deps/openssl/openssl/include/openssl/mdc2.h b/deps/openssl/openssl/include/openssl/mdc2.h
new file mode 120000
index 00000000000000..0bc32f121cb32d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/mdc2.h
@@ -0,0 +1 @@
+../../crypto/mdc2/mdc2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/modes.h b/deps/openssl/openssl/include/openssl/modes.h
deleted file mode 100644
index f57fcfea800134..00000000000000
--- a/deps/openssl/openssl/include/openssl/modes.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/modes/modes.h"
diff --git a/deps/openssl/openssl/include/openssl/modes.h b/deps/openssl/openssl/include/openssl/modes.h
new file mode 120000
index 00000000000000..ccc172827f118b
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/modes.h
@@ -0,0 +1 @@
+../../crypto/modes/modes.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/obj_mac.h b/deps/openssl/openssl/include/openssl/obj_mac.h
deleted file mode 100644
index 3890fa9bc419b9..00000000000000
--- a/deps/openssl/openssl/include/openssl/obj_mac.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/objects/obj_mac.h"
diff --git a/deps/openssl/openssl/include/openssl/obj_mac.h b/deps/openssl/openssl/include/openssl/obj_mac.h
new file mode 120000
index 00000000000000..0f443c828bc528
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/obj_mac.h
@@ -0,0 +1 @@
+../../crypto/objects/obj_mac.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/objects.h b/deps/openssl/openssl/include/openssl/objects.h
deleted file mode 100644
index 5365a044bdc0ca..00000000000000
--- a/deps/openssl/openssl/include/openssl/objects.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/objects/objects.h"
diff --git a/deps/openssl/openssl/include/openssl/objects.h b/deps/openssl/openssl/include/openssl/objects.h
new file mode 120000
index 00000000000000..7bd145ca0864ba
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/objects.h
@@ -0,0 +1 @@
+../../crypto/objects/objects.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ocsp.h b/deps/openssl/openssl/include/openssl/ocsp.h
deleted file mode 100644
index 50e2885cedb5cb..00000000000000
--- a/deps/openssl/openssl/include/openssl/ocsp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ocsp/ocsp.h"
diff --git a/deps/openssl/openssl/include/openssl/ocsp.h b/deps/openssl/openssl/include/openssl/ocsp.h
new file mode 120000
index 00000000000000..08288c84a65a1f
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ocsp.h
@@ -0,0 +1 @@
+../../crypto/ocsp/ocsp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/opensslconf.h b/deps/openssl/openssl/include/openssl/opensslconf.h
deleted file mode 100644
index 221be629b72248..00000000000000
--- a/deps/openssl/openssl/include/openssl/opensslconf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/opensslconf.h"
diff --git a/deps/openssl/openssl/include/openssl/opensslconf.h b/deps/openssl/openssl/include/openssl/opensslconf.h
new file mode 120000
index 00000000000000..25d2bea96c84fa
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/opensslconf.h
@@ -0,0 +1 @@
+../../crypto/opensslconf.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/opensslv.h b/deps/openssl/openssl/include/openssl/opensslv.h
deleted file mode 100644
index c39a0c3882d3bb..00000000000000
--- a/deps/openssl/openssl/include/openssl/opensslv.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/opensslv.h"
diff --git a/deps/openssl/openssl/include/openssl/opensslv.h b/deps/openssl/openssl/include/openssl/opensslv.h
new file mode 120000
index 00000000000000..f314f5fc717d12
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/opensslv.h
@@ -0,0 +1 @@
+../../crypto/opensslv.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ossl_typ.h b/deps/openssl/openssl/include/openssl/ossl_typ.h
deleted file mode 100644
index ddd7e580dd6c8a..00000000000000
--- a/deps/openssl/openssl/include/openssl/ossl_typ.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ossl_typ.h"
diff --git a/deps/openssl/openssl/include/openssl/ossl_typ.h b/deps/openssl/openssl/include/openssl/ossl_typ.h
new file mode 120000
index 00000000000000..e8f42456e143cb
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ossl_typ.h
@@ -0,0 +1 @@
+../../crypto/ossl_typ.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pem.h b/deps/openssl/openssl/include/openssl/pem.h
deleted file mode 100644
index 5bcc5c59eed0d6..00000000000000
--- a/deps/openssl/openssl/include/openssl/pem.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/pem/pem.h"
diff --git a/deps/openssl/openssl/include/openssl/pem.h b/deps/openssl/openssl/include/openssl/pem.h
new file mode 120000
index 00000000000000..ca371423e7bd0a
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pem.h
@@ -0,0 +1 @@
+../../crypto/pem/pem.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pem2.h b/deps/openssl/openssl/include/openssl/pem2.h
deleted file mode 100644
index bcd3acf856be27..00000000000000
--- a/deps/openssl/openssl/include/openssl/pem2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/pem/pem2.h"
diff --git a/deps/openssl/openssl/include/openssl/pem2.h b/deps/openssl/openssl/include/openssl/pem2.h
new file mode 120000
index 00000000000000..c734dbdc3f3d62
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pem2.h
@@ -0,0 +1 @@
+../../crypto/pem/pem2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pkcs12.h b/deps/openssl/openssl/include/openssl/pkcs12.h
deleted file mode 100644
index 0b5fbbfe863d5c..00000000000000
--- a/deps/openssl/openssl/include/openssl/pkcs12.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/pkcs12/pkcs12.h"
diff --git a/deps/openssl/openssl/include/openssl/pkcs12.h b/deps/openssl/openssl/include/openssl/pkcs12.h
new file mode 120000
index 00000000000000..eebba777899c19
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pkcs12.h
@@ -0,0 +1 @@
+../../crypto/pkcs12/pkcs12.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pkcs7.h b/deps/openssl/openssl/include/openssl/pkcs7.h
deleted file mode 100644
index 2e19d7c4c9b963..00000000000000
--- a/deps/openssl/openssl/include/openssl/pkcs7.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/pkcs7/pkcs7.h"
diff --git a/deps/openssl/openssl/include/openssl/pkcs7.h b/deps/openssl/openssl/include/openssl/pkcs7.h
new file mode 120000
index 00000000000000..73e1b23f77eb66
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pkcs7.h
@@ -0,0 +1 @@
+../../crypto/pkcs7/pkcs7.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/pqueue.h b/deps/openssl/openssl/include/openssl/pqueue.h
deleted file mode 100644
index 9681ff52cd255c..00000000000000
--- a/deps/openssl/openssl/include/openssl/pqueue.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/pqueue/pqueue.h"
diff --git a/deps/openssl/openssl/include/openssl/pqueue.h b/deps/openssl/openssl/include/openssl/pqueue.h
new file mode 120000
index 00000000000000..93817c2dfcd9ef
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/pqueue.h
@@ -0,0 +1 @@
+../../crypto/pqueue/pqueue.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rand.h b/deps/openssl/openssl/include/openssl/rand.h
deleted file mode 100644
index 9d1521bd4e335d..00000000000000
--- a/deps/openssl/openssl/include/openssl/rand.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/rand/rand.h"
diff --git a/deps/openssl/openssl/include/openssl/rand.h b/deps/openssl/openssl/include/openssl/rand.h
new file mode 120000
index 00000000000000..11231f8523913c
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rand.h
@@ -0,0 +1 @@
+../../crypto/rand/rand.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rc2.h b/deps/openssl/openssl/include/openssl/rc2.h
deleted file mode 100644
index f2f2bd1f21c0b4..00000000000000
--- a/deps/openssl/openssl/include/openssl/rc2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/rc2/rc2.h"
diff --git a/deps/openssl/openssl/include/openssl/rc2.h b/deps/openssl/openssl/include/openssl/rc2.h
new file mode 120000
index 00000000000000..bb5a05c5d1e753
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rc2.h
@@ -0,0 +1 @@
+../../crypto/rc2/rc2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rc4.h b/deps/openssl/openssl/include/openssl/rc4.h
deleted file mode 100644
index 306de2f406e810..00000000000000
--- a/deps/openssl/openssl/include/openssl/rc4.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/rc4/rc4.h"
diff --git a/deps/openssl/openssl/include/openssl/rc4.h b/deps/openssl/openssl/include/openssl/rc4.h
new file mode 120000
index 00000000000000..ef7deeb7d4a89c
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rc4.h
@@ -0,0 +1 @@
+../../crypto/rc4/rc4.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ripemd.h b/deps/openssl/openssl/include/openssl/ripemd.h
deleted file mode 100644
index 11351fc819d1b7..00000000000000
--- a/deps/openssl/openssl/include/openssl/ripemd.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ripemd/ripemd.h"
diff --git a/deps/openssl/openssl/include/openssl/ripemd.h b/deps/openssl/openssl/include/openssl/ripemd.h
new file mode 120000
index 00000000000000..200f562fa7d014
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ripemd.h
@@ -0,0 +1 @@
+../../crypto/ripemd/ripemd.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/rsa.h b/deps/openssl/openssl/include/openssl/rsa.h
deleted file mode 100644
index 975e5d355abd47..00000000000000
--- a/deps/openssl/openssl/include/openssl/rsa.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/rsa/rsa.h"
diff --git a/deps/openssl/openssl/include/openssl/rsa.h b/deps/openssl/openssl/include/openssl/rsa.h
new file mode 120000
index 00000000000000..3e5a6547543cb9
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/rsa.h
@@ -0,0 +1 @@
+../../crypto/rsa/rsa.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/safestack.h b/deps/openssl/openssl/include/openssl/safestack.h
deleted file mode 100644
index 8a282b858ba108..00000000000000
--- a/deps/openssl/openssl/include/openssl/safestack.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/stack/safestack.h"
diff --git a/deps/openssl/openssl/include/openssl/safestack.h b/deps/openssl/openssl/include/openssl/safestack.h
new file mode 120000
index 00000000000000..8ca5b4cc7c5c42
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/safestack.h
@@ -0,0 +1 @@
+../../crypto/stack/safestack.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/seed.h b/deps/openssl/openssl/include/openssl/seed.h
deleted file mode 100644
index bbbf596df86ce5..00000000000000
--- a/deps/openssl/openssl/include/openssl/seed.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/seed/seed.h"
diff --git a/deps/openssl/openssl/include/openssl/seed.h b/deps/openssl/openssl/include/openssl/seed.h
new file mode 120000
index 00000000000000..05d04a50bf8069
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/seed.h
@@ -0,0 +1 @@
+../../crypto/seed/seed.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/sha.h b/deps/openssl/openssl/include/openssl/sha.h
deleted file mode 100644
index ab9d94c38689b8..00000000000000
--- a/deps/openssl/openssl/include/openssl/sha.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/sha/sha.h"
diff --git a/deps/openssl/openssl/include/openssl/sha.h b/deps/openssl/openssl/include/openssl/sha.h
new file mode 120000
index 00000000000000..3025cd5d7e5aa2
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/sha.h
@@ -0,0 +1 @@
+../../crypto/sha/sha.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/srp.h b/deps/openssl/openssl/include/openssl/srp.h
deleted file mode 100644
index 8217476779e610..00000000000000
--- a/deps/openssl/openssl/include/openssl/srp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/srp/srp.h"
diff --git a/deps/openssl/openssl/include/openssl/srp.h b/deps/openssl/openssl/include/openssl/srp.h
new file mode 120000
index 00000000000000..16b73ebd3ddeb6
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/srp.h
@@ -0,0 +1 @@
+../../crypto/srp/srp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/srtp.h b/deps/openssl/openssl/include/openssl/srtp.h
deleted file mode 100644
index e185494a523b02..00000000000000
--- a/deps/openssl/openssl/include/openssl/srtp.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/srtp.h"
diff --git a/deps/openssl/openssl/include/openssl/srtp.h b/deps/openssl/openssl/include/openssl/srtp.h
new file mode 120000
index 00000000000000..9800e4ee402f35
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/srtp.h
@@ -0,0 +1 @@
+../../ssl/srtp.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl.h b/deps/openssl/openssl/include/openssl/ssl.h
deleted file mode 100644
index 0b0589c639a94d..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/ssl.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl.h b/deps/openssl/openssl/include/openssl/ssl.h
new file mode 120000
index 00000000000000..e87d9be8fc6636
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl.h
@@ -0,0 +1 @@
+../../ssl/ssl.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl2.h b/deps/openssl/openssl/include/openssl/ssl2.h
deleted file mode 100644
index 11b22055ea7334..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl2.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/ssl2.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl2.h b/deps/openssl/openssl/include/openssl/ssl2.h
new file mode 120000
index 00000000000000..72876883c6342d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl2.h
@@ -0,0 +1 @@
+../../ssl/ssl2.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl23.h b/deps/openssl/openssl/include/openssl/ssl23.h
deleted file mode 100644
index fe4dae6661ffbc..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl23.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/ssl23.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl23.h b/deps/openssl/openssl/include/openssl/ssl23.h
new file mode 120000
index 00000000000000..5605052d701347
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl23.h
@@ -0,0 +1 @@
+../../ssl/ssl23.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ssl3.h b/deps/openssl/openssl/include/openssl/ssl3.h
deleted file mode 100644
index 0fb66a6f752062..00000000000000
--- a/deps/openssl/openssl/include/openssl/ssl3.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/ssl3.h"
diff --git a/deps/openssl/openssl/include/openssl/ssl3.h b/deps/openssl/openssl/include/openssl/ssl3.h
new file mode 120000
index 00000000000000..5ae2507f28a184
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ssl3.h
@@ -0,0 +1 @@
+../../ssl/ssl3.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/stack.h b/deps/openssl/openssl/include/openssl/stack.h
deleted file mode 100644
index 295968cc186805..00000000000000
--- a/deps/openssl/openssl/include/openssl/stack.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/stack/stack.h"
diff --git a/deps/openssl/openssl/include/openssl/stack.h b/deps/openssl/openssl/include/openssl/stack.h
new file mode 120000
index 00000000000000..61d342fcdc5809
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/stack.h
@@ -0,0 +1 @@
+../../crypto/stack/stack.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/symhacks.h b/deps/openssl/openssl/include/openssl/symhacks.h
deleted file mode 100644
index f946f4ffc6f301..00000000000000
--- a/deps/openssl/openssl/include/openssl/symhacks.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/symhacks.h"
diff --git a/deps/openssl/openssl/include/openssl/symhacks.h b/deps/openssl/openssl/include/openssl/symhacks.h
new file mode 120000
index 00000000000000..4a1a6913cf755d
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/symhacks.h
@@ -0,0 +1 @@
+../../crypto/symhacks.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/tls1.h b/deps/openssl/openssl/include/openssl/tls1.h
deleted file mode 100644
index c43a70ff31fb4d..00000000000000
--- a/deps/openssl/openssl/include/openssl/tls1.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../ssl/tls1.h"
diff --git a/deps/openssl/openssl/include/openssl/tls1.h b/deps/openssl/openssl/include/openssl/tls1.h
new file mode 120000
index 00000000000000..53d998fbd86083
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/tls1.h
@@ -0,0 +1 @@
+../../ssl/tls1.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ts.h b/deps/openssl/openssl/include/openssl/ts.h
deleted file mode 100644
index fe8a2cb51a2eea..00000000000000
--- a/deps/openssl/openssl/include/openssl/ts.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ts/ts.h"
diff --git a/deps/openssl/openssl/include/openssl/ts.h b/deps/openssl/openssl/include/openssl/ts.h
new file mode 120000
index 00000000000000..a75d99db1a88dc
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ts.h
@@ -0,0 +1 @@
+../../crypto/ts/ts.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/txt_db.h b/deps/openssl/openssl/include/openssl/txt_db.h
deleted file mode 100644
index 167621b6fa881f..00000000000000
--- a/deps/openssl/openssl/include/openssl/txt_db.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/txt_db/txt_db.h"
diff --git a/deps/openssl/openssl/include/openssl/txt_db.h b/deps/openssl/openssl/include/openssl/txt_db.h
new file mode 120000
index 00000000000000..f672e35520c0ec
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/txt_db.h
@@ -0,0 +1 @@
+../../crypto/txt_db/txt_db.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ui.h b/deps/openssl/openssl/include/openssl/ui.h
deleted file mode 100644
index 43dd3ae83a51b7..00000000000000
--- a/deps/openssl/openssl/include/openssl/ui.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ui/ui.h"
diff --git a/deps/openssl/openssl/include/openssl/ui.h b/deps/openssl/openssl/include/openssl/ui.h
new file mode 120000
index 00000000000000..b07defad72b11c
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ui.h
@@ -0,0 +1 @@
+../../crypto/ui/ui.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/ui_compat.h b/deps/openssl/openssl/include/openssl/ui_compat.h
deleted file mode 100644
index c83f160d802112..00000000000000
--- a/deps/openssl/openssl/include/openssl/ui_compat.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/ui/ui_compat.h"
diff --git a/deps/openssl/openssl/include/openssl/ui_compat.h b/deps/openssl/openssl/include/openssl/ui_compat.h
new file mode 120000
index 00000000000000..d8c74b7c5d72f8
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/ui_compat.h
@@ -0,0 +1 @@
+../../crypto/ui/ui_compat.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/whrlpool.h b/deps/openssl/openssl/include/openssl/whrlpool.h
deleted file mode 100644
index e2424fadde2788..00000000000000
--- a/deps/openssl/openssl/include/openssl/whrlpool.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/whrlpool/whrlpool.h"
diff --git a/deps/openssl/openssl/include/openssl/whrlpool.h b/deps/openssl/openssl/include/openssl/whrlpool.h
new file mode 120000
index 00000000000000..125a0816f509db
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/whrlpool.h
@@ -0,0 +1 @@
+../../crypto/whrlpool/whrlpool.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/x509.h b/deps/openssl/openssl/include/openssl/x509.h
deleted file mode 100644
index a4651a28652433..00000000000000
--- a/deps/openssl/openssl/include/openssl/x509.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/x509/x509.h"
diff --git a/deps/openssl/openssl/include/openssl/x509.h b/deps/openssl/openssl/include/openssl/x509.h
new file mode 120000
index 00000000000000..b2b85c52486dff
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/x509.h
@@ -0,0 +1 @@
+../../crypto/x509/x509.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/x509_vfy.h b/deps/openssl/openssl/include/openssl/x509_vfy.h
deleted file mode 100644
index b897aa087bdae8..00000000000000
--- a/deps/openssl/openssl/include/openssl/x509_vfy.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/x509/x509_vfy.h"
diff --git a/deps/openssl/openssl/include/openssl/x509_vfy.h b/deps/openssl/openssl/include/openssl/x509_vfy.h
new file mode 120000
index 00000000000000..bb99ad49811ad4
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/x509_vfy.h
@@ -0,0 +1 @@
+../../crypto/x509/x509_vfy.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/include/openssl/x509v3.h b/deps/openssl/openssl/include/openssl/x509v3.h
deleted file mode 100644
index 363795e55a280a..00000000000000
--- a/deps/openssl/openssl/include/openssl/x509v3.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "../../crypto/x509v3/x509v3.h"
diff --git a/deps/openssl/openssl/include/openssl/x509v3.h b/deps/openssl/openssl/include/openssl/x509v3.h
new file mode 120000
index 00000000000000..63d12f9dc5f788
--- /dev/null
+++ b/deps/openssl/openssl/include/openssl/x509v3.h
@@ -0,0 +1 @@
+../../crypto/x509v3/x509v3.h
\ No newline at end of file
diff --git a/deps/openssl/openssl/openssl.spec b/deps/openssl/openssl/openssl.spec
index 01f06171ccd337..e6c75843305470 100644
--- a/deps/openssl/openssl/openssl.spec
+++ b/deps/openssl/openssl/openssl.spec
@@ -6,7 +6,7 @@ Release: 1
 
 Summary: Secure Sockets Layer and cryptography libraries and tools
 Name: openssl
-Version: 1.0.2b
+Version: 1.0.2c
 Source0: ftp://ftp.openssl.org/source/%{name}-%{version}.tar.gz
 License: OpenSSL
 Group: System Environment/Libraries
diff --git a/deps/openssl/openssl/ssl/t1_lib.c b/deps/openssl/openssl/ssl/t1_lib.c
index d811d3fdb88f11..210a5e87430f26 100644
--- a/deps/openssl/openssl/ssl/t1_lib.c
+++ b/deps/openssl/openssl/ssl/t1_lib.c
@@ -2016,12 +2016,12 @@ static int ssl_scan_clienthello_tlsext(SSL *s, unsigned char **p,
 
     s->srtp_profile = NULL;
 
-    if (data >= (d + n - 2)) {
-        if (data != d + n)
-            goto err;
-        else
-            goto ri_check;
-    }
+    if (data == d + n)
+        goto ri_check;
+
+    if (data > (d + n - 2))
+        goto err;
+
     n2s(data, len);
 
     if (data > (d + n - len))