diff --git a/deps/openssl/openssl/crypto/dso/Makefile.save b/deps/openssl/openssl/crypto/dso/Makefile.save
diff --git a/deps/openssl/openssl/crypto/dso/dso_dlfcn.c b/deps/openssl/openssl/crypto/dso/dso_dlfcn.c
@@ -464,7 +464,7 @@ static int dlfcn_pathbyaddr(void *addr,char *path,int sz)
 		return len;
 		}
 
-	ERR_add_error_data(4, "dlfcn_pathbyaddr(): ", dlerror());
+	ERR_add_error_data(2, "dlfcn_pathbyaddr(): ", dlerror());
 #endif
 	return -1;
 	}

diff --git a/deps/openssl/openssl/crypto/dso/dso_vms.c b/deps/openssl/openssl/crypto/dso/dso_vms.c
@@ -61,15 +61,21 @@
 #include <errno.h>
 #include "cryptlib.h"
 #include <openssl/dso.h>
-#ifdef OPENSSL_SYS_VMS
+
+#ifndef OPENSSL_SYS_VMS
+DSO_METHOD *DSO_METHOD_vms(void)
+	{
+	return NULL;
+	}
+#else
+
 #pragma message disable DOLLARID
 #include <rms.h>
 #include <lib$routines.h>
 #include <stsdef.h>
 #include <descrip.h>
 #include <starlet.h>
 #include "vms_rms.h"
-#endif
 
 /* Some compiler options may mask the declaration of "_malloc32". */
 #if __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE
@@ -82,12 +88,6 @@
 #endif /* __INITIAL_POINTER_SIZE && defined _ANSI_C_SOURCE */
 
 
-#ifndef OPENSSL_SYS_VMS
-DSO_METHOD *DSO_METHOD_vms(void)
-	{
-	return NULL;
-	}
-#else
 #pragma message disable DOLLARID
 
 static int vms_load(DSO *dso);

diff --git a/deps/openssl/openssl/crypto/ec/Makefile.save b/deps/openssl/openssl/crypto/ec/Makefile.save
diff --git a/deps/openssl/openssl/crypto/ec/ec_ameth.c b/deps/openssl/openssl/crypto/ec/ec_ameth.c
@@ -352,6 +352,7 @@ static int eckey_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
 		EC_KEY_set_enc_flags(ec_key, old_flags);
 		OPENSSL_free(ep);
 		ECerr(EC_F_ECKEY_PRIV_ENCODE, ERR_R_EC_LIB);
+		return 0;
 	}
 	/* restore old encoding flags */
 	EC_KEY_set_enc_flags(ec_key, old_flags);

diff --git a/deps/openssl/openssl/crypto/ec/ec_asn1.c b/deps/openssl/openssl/crypto/ec/ec_asn1.c
@@ -1435,8 +1435,11 @@ int i2o_ECPublicKey(EC_KEY *a, unsigned char **out)
 				*out, buf_len, NULL))
 		{
 		ECerr(EC_F_I2O_ECPUBLICKEY, ERR_R_EC_LIB);
-		OPENSSL_free(*out);
-		*out = NULL;
+		if (new_buffer)
+			{
+			OPENSSL_free(*out);
+			*out = NULL;
+			}
 		return 0;
 		}
 	if (!new_buffer)

diff --git a/deps/openssl/openssl/crypto/ec/ec_lcl.h b/deps/openssl/openssl/crypto/ec/ec_lcl.h
@@ -404,7 +404,7 @@ int ec_GF2m_simple_mul(const EC_GROUP *group, EC_POINT *r, const BIGNUM *scalar,
 int ec_GF2m_precompute_mult(EC_GROUP *group, BN_CTX *ctx);
 int ec_GF2m_have_precompute_mult(const EC_GROUP *group);
 
-#ifndef OPENSSL_EC_NISTP_64_GCC_128
+#ifndef OPENSSL_NO_EC_NISTP_64_GCC_128
 /* method functions in ecp_nistp224.c */
 int ec_GFp_nistp224_group_init(EC_GROUP *group);
 int ec_GFp_nistp224_group_set_curve(EC_GROUP *group, const BIGNUM *p, const BIGNUM *a, const BIGNUM *n, BN_CTX *);

diff --git a/deps/openssl/openssl/crypto/ecdh/Makefile.save b/deps/openssl/openssl/crypto/ecdh/Makefile.save
diff --git a/deps/openssl/openssl/crypto/ecdsa/Makefile.save b/deps/openssl/openssl/crypto/ecdsa/Makefile.save
diff --git a/deps/openssl/openssl/crypto/engine/Makefile.save b/deps/openssl/openssl/crypto/engine/Makefile.save
diff --git a/deps/openssl/openssl/crypto/err/Makefile.save b/deps/openssl/openssl/crypto/err/Makefile.save
diff --git a/deps/openssl/openssl/crypto/evp/Makefile.save b/deps/openssl/openssl/crypto/evp/Makefile.save
diff --git a/deps/openssl/openssl/crypto/evp/bio_b64.c b/deps/openssl/openssl/crypto/evp/bio_b64.c
@@ -226,6 +226,7 @@ static int b64_read(BIO *b, char *out, int outl)
 		else if (ctx->start)
 			{
 			q=p=(unsigned char *)ctx->tmp;
+			num = 0;
 			for (j=0; j<i; j++)
 				{
 				if (*(q++) != '\n') continue;

diff --git a/deps/openssl/openssl/crypto/evp/encode.c b/deps/openssl/openssl/crypto/evp/encode.c
@@ -324,6 +324,7 @@ int EVP_DecodeUpdate(EVP_ENCODE_CTX *ctx, unsigned char *out, int *outl,
 				v=EVP_DecodeBlock(out,d,n);
 				n=0;
 				if (v < 0) { rv=0; goto end; }
+				if (eof > v) { rv=-1; goto end; }
 				ret+=(v-eof);
 				}
 			else

diff --git a/deps/openssl/openssl/crypto/hmac/Makefile.save b/deps/openssl/openssl/crypto/hmac/Makefile.save
diff --git a/deps/openssl/openssl/crypto/idea/Makefile.save b/deps/openssl/openssl/crypto/idea/Makefile.save
diff --git a/deps/openssl/openssl/crypto/krb5/Makefile.save b/deps/openssl/openssl/crypto/krb5/Makefile.save
diff --git a/deps/openssl/openssl/crypto/lhash/Makefile.save b/deps/openssl/openssl/crypto/lhash/Makefile.save
diff --git a/deps/openssl/openssl/crypto/md4/Makefile.save b/deps/openssl/openssl/crypto/md4/Makefile.save
diff --git a/deps/openssl/openssl/crypto/md5/Makefile.save b/deps/openssl/openssl/crypto/md5/Makefile.save
diff --git a/deps/openssl/openssl/crypto/mdc2/Makefile.save b/deps/openssl/openssl/crypto/mdc2/Makefile.save
diff --git a/deps/openssl/openssl/crypto/modes/Makefile.save b/deps/openssl/openssl/crypto/modes/Makefile.save
diff --git a/deps/openssl/openssl/crypto/objects/Makefile.save b/deps/openssl/openssl/crypto/objects/Makefile.save
diff --git a/deps/openssl/openssl/crypto/ocsp/Makefile.save b/deps/openssl/openssl/crypto/ocsp/Makefile.save
diff --git a/deps/openssl/openssl/crypto/opensslv.h b/deps/openssl/openssl/crypto/opensslv.h
@@ -25,11 +25,11 @@
  * (Prior to 0.9.5a beta1, a different scheme was used: MMNNFFRBB for
  *  major minor fix final patch/beta)
  */
-#define OPENSSL_VERSION_NUMBER	0x1000107fL
+#define OPENSSL_VERSION_NUMBER	0x1000108fL
 #ifdef OPENSSL_FIPS
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g-fips 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h-fips 5 Jun 2014"
 #else
-#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1g 7 Apr 2014"
+#define OPENSSL_VERSION_TEXT	"OpenSSL 1.0.1h 5 Jun 2014"
 #endif
 #define OPENSSL_VERSION_PTEXT	" part of " OPENSSL_VERSION_TEXT
 

diff --git a/deps/openssl/openssl/crypto/pem/Makefile.save b/deps/openssl/openssl/crypto/pem/Makefile.save