diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 1d7e6666..ef54e215 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -98,7 +98,7 @@ MISC_SCRIPTS=$(BLDDIR)\apps\CA.pl $(BLDDIR)\apps\tsget.pl
 INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
                   #
                   use File::Spec::Functions qw(:DEFAULT splitpath);
-                  our $prefix = $config{prefix} || "$win_installroot\\OpenSSL";
+                  our $prefix = $config{prefix} || "$win_installroot\\GmSSL";
                   our ($prefix_dev, $prefix_dir, $prefix_file) =
                       splitpath($prefix, 1);
                   $prefix_dev -}
diff --git a/Configure b/Configure
index 2463e8e2..627935dd 100755
--- a/Configure
+++ b/Configure
@@ -313,7 +313,7 @@ $config{sdirs} = [
     "cms", "ts", "srp", "cmac", "ct", "async", "kdf",
     "sm3", "sms4", "kdf2", "ecies", "ffx", "sm2", "paillier", "cpk", "otp", "gmapi", "ec2",
     "bfibe", "bb1ibe", "sm9", "saf", "sdf", "skf", "sof", "zuc",
-    "serpent", "speck"
+    "serpent", "speck", "base58"
     ];
 
 # Known TLS and DTLS protocols
@@ -435,6 +435,7 @@ my @disablables = (
     "pkcs12",
     "serpent",
     "speck",
+    "base58",
     );
 foreach my $proto ((@tls, @dtls))
 	{
diff --git a/crypto/base58/base58.c b/crypto/base58/base58.c
index e9f85f2a..f3dfb4ed 100644
--- a/crypto/base58/base58.c
+++ b/crypto/base58/base58.c
@@ -1,3 +1,51 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
 /*
  * Copyright 2012-2014 Luke Dashjr
  *
@@ -11,7 +59,7 @@
 #include <string.h>
 #include <sys/types.h>
 
-#include "base58.h"
+#include <openssl/base58.h>
 
 static const int8_t b58digits_map[] = {
 	-1,-1,-1,-1,-1,-1,-1,-1, -1,-1,-1,-1,-1,-1,-1,-1,
@@ -147,4 +195,3 @@ bool base58_encode(const void *data, size_t binsz, char *b58, size_t *b58sz)
 	
 	return true;
 }
-
diff --git a/crypto/base58/build.info b/crypto/base58/build.info
new file mode 100644
index 00000000..e32e83e7
--- /dev/null
+++ b/crypto/base58/build.info
@@ -0,0 +1,2 @@
+LIBS=../../libcrypto
+SOURCE[../../libcrypto]=base58.c
diff --git a/crypto/ec/ec_pmeth.c b/crypto/ec/ec_pmeth.c
index 7e46469e..d45580b2 100644
--- a/crypto/ec/ec_pmeth.c
+++ b/crypto/ec/ec_pmeth.c
@@ -61,7 +61,7 @@ static int pkey_ec_init(EVP_PKEY_CTX *ctx)
     dctx->sign_type = NID_secg_scheme;
     dctx->exch_type = NID_secg_scheme;
     dctx->enc_type = NID_secg_scheme;
-    dctx->enc_param = NID_undef;
+    dctx->enc_param = NID_sm3;            
 #endif
     ctx->data = dctx;
     return 1;
diff --git a/crypto/serpent/serpent.c b/crypto/serpent/serpent.c
index 22438e91..9943c49d 100644
--- a/crypto/serpent/serpent.c
+++ b/crypto/serpent/serpent.c
@@ -1,3 +1,51 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
 /**
 Copyright © 2015 Odzhan
 Copyright © 2008 Daniel Otte
diff --git a/crypto/sm2/build.info b/crypto/sm2/build.info
index 88d697ca..6b650d73 100644
--- a/crypto/sm2/build.info
+++ b/crypto/sm2/build.info
@@ -1,3 +1,3 @@
 LIBS=../../libcrypto
 SOURCE[../../libcrypto]=sm2_err.c sm2_asn1.c sm2_id.c sm2_sign.c sm2_enc.c \
-			sm2_exch.c sm2_kmeth.c
+			sm2_oct.c sm2_exch.c sm2_kmeth.c
diff --git a/crypto/sm2/sm2_enc.c b/crypto/sm2/sm2_enc.c
index 30a73694..49084554 100644
--- a/crypto/sm2/sm2_enc.c
+++ b/crypto/sm2/sm2_enc.c
@@ -321,6 +321,7 @@ int SM2_do_decrypt(const EVP_MD *md, const SM2CiphertextValue *cv,
 	const BIGNUM *pri_key;
 	KDF_FUNC kdf;
 	EC_POINT *point = NULL;
+	EC_POINT *tmp_point = NULL;
 	BIGNUM *n = NULL;
 	BIGNUM *h = NULL;
 	BN_CTX *bn_ctx = NULL;
@@ -374,6 +375,7 @@ int SM2_do_decrypt(const EVP_MD *md, const SM2CiphertextValue *cv,
 
 	/* malloc */
 	point = EC_POINT_new(group);
+	tmp_point = EC_POINT_new(group);
 	n = BN_new();
 	h = BN_new();
 	bn_ctx = BN_CTX_new();
@@ -412,12 +414,12 @@ int SM2_do_decrypt(const EVP_MD *md, const SM2CiphertextValue *cv,
 	}
 
 	/* check [h]C1 != O */
-	if (!EC_POINT_mul(group, point, NULL, point, h, bn_ctx)) {
+	if (!EC_POINT_mul(group, tmp_point, NULL, point, h, bn_ctx)) {
 		SM2err(SM2_F_SM2_DO_DECRYPT, ERR_R_EC_LIB);
 		goto end;
 	}
 
-	if (EC_POINT_is_at_infinity(group, point)) {
+	if (EC_POINT_is_at_infinity(group, tmp_point)) {
 		SM2err(SM2_F_SM2_DO_DECRYPT, SM2_R_INVALID_CIPHERTEXT);
 		goto end;
 	}
@@ -462,6 +464,7 @@ int SM2_do_decrypt(const EVP_MD *md, const SM2CiphertextValue *cv,
 	ret = 1;
 end:
 	EC_POINT_free(point);
+	EC_POINT_free(tmp_point);
 	BN_free(n);
 	BN_free(h);
 	BN_CTX_free(bn_ctx);
diff --git a/crypto/sm2/sm2_exch.c b/crypto/sm2/sm2_exch.c
index c712546b..2b81d7ae 100644
--- a/crypto/sm2/sm2_exch.c
+++ b/crypto/sm2/sm2_exch.c
@@ -69,6 +69,8 @@ int SM2_KAP_CTX_init(SM2_KAP_CTX *ctx,
 	}
 
 	memset(ctx, 0, sizeof(*ctx));
+	ctx->id_dgstlen = sizeof(ctx->id_dgst);
+	ctx->remote_id_dgstlen = sizeof(ctx->remote_id_dgst);
 
 	ctx->id_dgst_md = EVP_sm3();
 	ctx->kdf_md = EVP_sm3();
diff --git a/crypto/sm2/sm2_lcl.h b/crypto/sm2/sm2_lcl.h
index 88a03bba..cfec9e5b 100644
--- a/crypto/sm2/sm2_lcl.h
+++ b/crypto/sm2/sm2_lcl.h
@@ -99,7 +99,7 @@ struct sm2_kap_ctx_st {
 
 int i2o_SM2CiphertextValue(const EC_GROUP *group, const SM2CiphertextValue *cv,
 	unsigned char **pout);
-SM2CiphertextValue *o2i_SM2CiphertextValue(const EC_GROUP *group,
+SM2CiphertextValue *o2i_SM2CiphertextValue(const EC_GROUP *group, const EVP_MD *md,
 	SM2CiphertextValue **cv, const unsigned char **pin, long len);
 
 
diff --git a/crypto/sm2/sm2_oct.c b/crypto/sm2/sm2_oct.c
index 410b4e3d..6f951e77 100644
--- a/crypto/sm2/sm2_oct.c
+++ b/crypto/sm2/sm2_oct.c
@@ -66,6 +66,7 @@ int i2o_SM2CiphertextValue(const EC_GROUP *group, const SM2CiphertextValue *cv,
 	BN_CTX *bn_ctx = NULL;
 	unsigned char *buf;
 	unsigned char *p;
+	size_t siz;
 
 	if (!group || !cv || !pout) {
 		SM2err(SM2_F_I2O_SM2CIPHERTEXTVALUE,
@@ -76,7 +77,7 @@ int i2o_SM2CiphertextValue(const EC_GROUP *group, const SM2CiphertextValue *cv,
 	nbytes = (EC_GROUP_get_degree(group) + 7)/8;
 
 	if (!cv->xCoordinate || BN_num_bytes(cv->xCoordinate) > nbytes
-		|| !cv->yCoordinate || BN_num_bytes(cv->BN_num_bytes) > nbytes
+		|| !cv->yCoordinate || BN_num_bytes(cv->yCoordinate) > nbytes
 		|| ASN1_STRING_length(cv->hash) <= 0
 		|| ASN1_STRING_length(cv->hash) > EVP_MAX_MD_SIZE
 		|| ASN1_STRING_length(cv->ciphertext) <= 0) {
@@ -133,13 +134,13 @@ int i2o_SM2CiphertextValue(const EC_GROUP *group, const SM2CiphertextValue *cv,
 	memcpy(p, ASN1_STRING_get0_data(cv->ciphertext),
 		ASN1_STRING_length(cv->ciphertext));
 	p += ASN1_STRING_length(cv->ciphertext);
-	outlen += siz;
+	outlen += ASN1_STRING_length(cv->ciphertext);
 
 	/* encode hash */
-	memcpy(out, ASN1_STRING_get0_data(cv->hash),
+	memcpy(p, ASN1_STRING_get0_data(cv->hash),
 		ASN1_STRING_length(cv->hash));
 	p += ASN1_STRING_length(cv->hash);
-	outlen += siz;
+	outlen += ASN1_STRING_length(cv->hash);
 
 	/* output */
 	if (*pout) {
@@ -163,7 +164,9 @@ SM2CiphertextValue *o2i_SM2CiphertextValue(const EC_GROUP *group,
 	SM2CiphertextValue *ret = NULL;
 	SM2CiphertextValue *cv = NULL;
 	BN_CTX *bn_ctx = NULL;
-	unsigned char *p;
+	EC_POINT *point = NULL;
+	const unsigned char *p;
+	int nbytes;
 
 	if (!group || !pin) {
 		SM2err(SM2_F_O2I_SM2CIPHERTEXTVALUE,
@@ -190,7 +193,7 @@ SM2CiphertextValue *o2i_SM2CiphertextValue(const EC_GROUP *group,
 	}
 
 	if (!(point = EC_POINT_new(group))
-		|| !(bn_ctx = BN_CTX_new(bn_ctx))) {
+		|| !(bn_ctx = BN_CTX_new())) {
 		SM2err(SM2_F_O2I_SM2CIPHERTEXTVALUE,
 			ERR_R_MALLOC_FAILURE);
 		goto end;
@@ -276,36 +279,3 @@ end:
 	BN_CTX_free(bn_ctx);
 	return ret;
 }
-
-
-int SM2_encrypt(const EVP_MD *md, const unsigned char *in, size_t inlen,
-	unsigned char *out, size_t *outlen, EC_KEY *ec_key)
-{
-	int ret = 0;
-	SM2CiphertextValue *cv = NULL;
-
-	if (!(cv = SM2_do_encrypt(md, in, inlen, ec_key))) {
-		goto end;
-	}
-
-	if (!out) {
-		len = i2o_SM2CiphertextValue(cv, NULL);
-		*outlen = len;
-		return 1;
-	}
-
-	if (!(i2o_SM2CiphertextValue(cv, &out))) {
-		goto end;
-	}
-
-	return 0;
-}
-
-int SM2_decrypt(int type, const unsigned char *in, size_t inlen,
-	unsigned char *out, size_t *outlen, EC_KEY *ec_key)
-{
-
-	SM2CiphertextValue *cv = NULL;
-
-
-}
diff --git a/crypto/speck/speck.c b/crypto/speck/speck.c
index c717d394..1b95eb03 100644
--- a/crypto/speck/speck.c
+++ b/crypto/speck/speck.c
@@ -1,3 +1,52 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
 #include <openssl/speck.h>
 
 #define ROR(x, r) ((x >> r) | (x << ((sizeof(SPECK_TYPE) * 8) - r)))//循环右移
diff --git a/include/openssl/base58.h b/include/openssl/base58.h
index 87336aa3..388e4d2d 100644
--- a/include/openssl/base58.h
+++ b/include/openssl/base58.h
@@ -1,3 +1,51 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
 #ifndef HEADER_BASE58_H
 #define HEADER_BASE58_H
 
diff --git a/include/openssl/serpent.h b/include/openssl/serpent.h
index fa5147ee..7bd74c3f 100644
--- a/include/openssl/serpent.h
+++ b/include/openssl/serpent.h
@@ -1,3 +1,51 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
 /**
 Copyright © 2015 Odzhan
 Copyright © 2008 Daniel Otte
diff --git a/include/openssl/sm3.h b/include/openssl/sm3.h
index aff35899..20d1f693 100644
--- a/include/openssl/sm3.h
+++ b/include/openssl/sm3.h
@@ -49,7 +49,6 @@
 
 #ifndef HEADER_SM3_H
 #define HEADER_SM3_H
-#ifndef NO_GMSSL
 
 #define SM3_DIGEST_LENGTH	32
 #define SM3_BLOCK_SIZE		64
@@ -96,4 +95,3 @@ void sm3_hmac(const unsigned char *data, size_t data_len,
 }
 #endif
 #endif
-#endif
diff --git a/include/openssl/speck.h b/include/openssl/speck.h
index 899373a8..a41d73c6 100644
--- a/include/openssl/speck.h
+++ b/include/openssl/speck.h
@@ -1,3 +1,51 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
 #ifndef SPECK_H
 #define SPECK_H
 
diff --git a/test/base58test.c b/test/base58test.c
new file mode 100644
index 00000000..da2a5641
--- /dev/null
+++ b/test/base58test.c
@@ -0,0 +1,71 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+#include "../e_os.h"
+
+#ifdef OPENSSL_NO_BASE58
+int main(int argc, char **argv)
+{
+	printf("No BASE58 support\n");
+	return 0;
+}
+#else
+# include <openssl/evp.h>
+# include <openssl/base58.h>
+
+int main(int argc, char **argv)
+{
+	int err = 0;
+	EXIT(err);
+}
+#endif
diff --git a/test/build.info b/test/build.info
index 86d9fd03..6df80f22 100644
--- a/test/build.info
+++ b/test/build.info
@@ -21,7 +21,7 @@ IF[{- !$disabled{tests} -}]
           pailliertest cpktest otptest gmapitest ec2test \
           bfibetest bb1ibetest sm9test \
           saftest sdftest skftest softest zuctest \
-          serpenttest specktest
+          serpenttest specktest base58test
 
   SOURCE[aborttest]=aborttest.c
   INCLUDE[aborttest]=../include
@@ -376,6 +376,10 @@ IF[{- !$disabled{tests} -}]
   INCLUDE[specktest]=../include
   DEPEND[specktest]=../libcrypto
 
+  SOURCE[base58test]=base58test.c
+  INCLUDE[base58test]=../include
+  DEPEND[base58test]=../libcrypto
+
   IF[{- !$disabled{shared} -}]
     PROGRAMS_NO_INST=shlibloadtest
     SOURCE[shlibloadtest]=shlibloadtest.c
diff --git a/test/recipes/05-test_base58.t b/test/recipes/05-test_base58.t
new file mode 100644
index 00000000..37a2ea46
--- /dev/null
+++ b/test/recipes/05-test_base58.t
@@ -0,0 +1,12 @@
+#! /usr/bin/env perl
+# Copyright 2015-2016 The OpenSSL Project Authors. All Rights Reserved.
+#
+# Licensed under the OpenSSL license (the "License").  You may not use
+# this file except in compliance with the License.  You can obtain a copy
+# in the file LICENSE in the source distribution or at
+# https://www.openssl.org/source/license.html
+
+
+use OpenSSL::Test::Simple;
+
+simple_test("test_base58", "base58test", "base58");
diff --git a/test/serpenttest.c b/test/serpenttest.c
index 56cf5b2c..53ffeedf 100644
--- a/test/serpenttest.c
+++ b/test/serpenttest.c
@@ -1,3 +1,54 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+
+
 // test unit for serpent-256
 // Odzhan
 
diff --git a/test/sm2evptest.c b/test/sm2evptest.c
index a5d5cbe4..ca713b9a 100644
--- a/test/sm2evptest.c
+++ b/test/sm2evptest.c
@@ -208,6 +208,10 @@ static int test_evp_pkey_encrypt(EVP_PKEY *pkey, int do_sm2, int verbose)
 		goto end;
 	}
 
+					
+	/* we need to set the sm2 encrypt params (hash = sm3) */
+									
+
 	cbuflen = sizeof(cbuf);
 	if (!EVP_PKEY_encrypt(pkctx, cbuf, &cbuflen, msg, msglen)) {
 		fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__);
@@ -251,6 +255,7 @@ static int test_evp_pkey_encrypt(EVP_PKEY *pkey, int do_sm2, int verbose)
 
 	ret = 1;
 end:
+	ERR_print_errors_fp(stderr);
 	EVP_PKEY_CTX_free(pkctx);
 	return ret;
 }
@@ -590,14 +595,14 @@ int main(int argc, char **argv)
 		goto end;
 	}
 
-	if (!test_evp_pkey_sign(pkey, 1, verbose)) err++;
-	if (!test_evp_pkey_sign(pkey, 0, verbose)) err++;
+	//if (!test_evp_pkey_sign(pkey, 1, 0)) err++;
+	//if (!test_evp_pkey_sign(pkey, 0, 0)) err++;
 	if (!test_evp_pkey_encrypt(pkey, 1, verbose)) err++;
-	if (!test_evp_pkey_encrypt(pkey, 0, verbose)) err++;
-	if (!test_evp_pkey_encrypt_old(pkey, verbose)) err++;
-	if (!test_evp_sign(pkey, md, verbose)) err++;
-	if (!test_evp_seal(curve_id, cipher, out, verbose)) err++;
-	if (!test_evp_digestsign(pkey, 1, md, verbose)) err++;
+	//if (!test_evp_pkey_encrypt(pkey, 0, verbose)) err++;
+	//if (!test_evp_pkey_encrypt_old(pkey, verbose)) err++;
+	//if (!test_evp_sign(pkey, md, 0)) err++;
+	//if (!test_evp_seal(curve_id, cipher, out, verbose)) err++;
+	//if (!test_evp_digestsign(pkey, 1, md, verbose)) err++;
 
 end:
 	EVP_PKEY_free(pkey);
diff --git a/test/sm2test.c b/test/sm2test.c
index 5831e3f7..a3fb6ec3 100644
--- a/test/sm2test.c
+++ b/test/sm2test.c
@@ -67,7 +67,6 @@ int main(int argc, char **argv)
 # include <openssl/sm2.h>
 # include "../crypto/sm2/sm2_lcl.h"
 
-#if 0
 
 # define VERBOSE 1
 
@@ -424,19 +423,18 @@ static int test_sm2_enc(const EC_GROUP *group, const EVP_MD *md,
 	EC_KEY *pub_key = NULL;
 	EC_KEY *pri_key = NULL;
 	SM2CiphertextValue *cv = NULL;
-	unsigned char mbuf[128];
-	unsigned char cbuf[sizeof(mbuf) + 256];
 	unsigned char *tbuf = NULL;
-	size_t msglen, buflen;
-	unsigned char *p = buf;
-	unsigned char *testcbuf;
-	long testbuflen;
+	long tlen;
+	unsigned char mbuf[128] = {0};
+	unsigned char cbuf[sizeof(mbuf) + 256] = {0};
+	size_t mlen, clen;
+	unsigned char *p;
 
+	/* test encrypt */
 	if (!(pub_key = new_ec_key(group, NULL, xP, yP, NULL, NULL))) {
 		goto end;
 	}
 
-	/* test encrypt */
 	change_rand(k);
 	if (!(cv = SM2_do_encrypt(md, (unsigned char *)M, strlen(M), pub_key))) {
 		goto end;
@@ -456,7 +454,6 @@ static int test_sm2_enc(const EC_GROUP *group, const EVP_MD *md,
 	}
 
 	/* test decrypt */
-
 	if (!(pri_key = new_ec_key(group, d, xP, yP, NULL, NULL))) {
 		goto end;
 	}
@@ -475,8 +472,10 @@ static int test_sm2_enc(const EC_GROUP *group, const EVP_MD *md,
 end:
 	ERR_print_errors_fp(stderr);
 	restore_rand();
-	EC_KEY_free(ec_key);
 	EC_KEY_free(pub_key);
+	EC_KEY_free(pri_key);
+	SM2CiphertextValue_free(cv);
+	OPENSSL_free(tbuf);
 	return ret;
 }
 
@@ -513,24 +512,29 @@ static int test_sm2_kap(const EC_GROUP *group,
 	pubkeyA = new_ec_key(group, NULL, xA, yA, A, id_md);
 	pubkeyB = new_ec_key(group, NULL, xB, yB, B, id_md);
 	if (!eckeyA || !eckeyB || !pubkeyA || !pubkeyB) {
+		fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__);
 		goto end;
 	}
 
 	if (!SM2_KAP_CTX_init(&ctxA, eckeyA, A, strlen(A), pubkeyB, B, strlen(B), 1, 1)) {
+		fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__);
 		goto end;
 	}
 	if (!SM2_KAP_CTX_init(&ctxB, eckeyB, B, strlen(B), pubkeyA, A, strlen(A), 0, 1)) {
+		fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__);
 		goto end;
 	}
 
 	change_rand(rA);
 	if (!SM2_KAP_prepare(&ctxA, RA, &RAlen)) {
+		fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__);
 		goto end;
 	}
 	restore_rand();
 
 	change_rand(rB);
 	if (!SM2_KAP_prepare(&ctxB, RB, &RBlen)) {
+		fprintf(stderr, "error: %s %d\n", __FILE__, __LINE__);
 		goto end;
 	}
 	restore_rand();
@@ -555,6 +559,7 @@ static int test_sm2_kap(const EC_GROUP *group,
 	ret = 1;
 
 end:
+	ERR_print_errors_fp(stderr);
 	EC_KEY_free(eckeyA);
 	EC_KEY_free(eckeyB);
 	EC_KEY_free(pubkeyA);
@@ -742,11 +747,4 @@ end:
 	EC_GROUP_free(sm2b257test);
 	EXIT(err);
 }
-#else
-int main()
-{
-	return 0;
-}
-
-#endif
 #endif
diff --git a/test/specktest.c b/test/specktest.c
index 00dbe7f7..947426fc 100644
--- a/test/specktest.c
+++ b/test/specktest.c
@@ -1,3 +1,53 @@
+/* ====================================================================
+ * Copyright (c) 2014 - 2017 The GmSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the GmSSL Project.
+ *    (http://gmssl.org/)"
+ *
+ * 4. The name "GmSSL Project" must not be used to endorse or promote
+ *    products derived from this software without prior written
+ *    permission. For written permission, please contact
+ *    guanzhi1980@gmail.com.
+ *
+ * 5. Products derived from this software may not be called "GmSSL"
+ *    nor may "GmSSL" appear in their names without prior written
+ *    permission of the GmSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the GmSSL Project
+ *    (http://gmssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE GmSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE GmSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ */
+
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/util/mkdef.pl b/util/mkdef.pl
index 43701791..407a4ff8 100755
--- a/util/mkdef.pl
+++ b/util/mkdef.pl
@@ -134,7 +134,7 @@ my @known_algorithms = ( "RC2", "RC4", "RC5", "IDEA", "DES", "BF",
                          "APPLINK",
                          # GmSSL
                          "SM3", "SMS4", "KDF2", "ECIES", "FFX", "SM2", "PAILLIER", "CPK", "OTP", "GMAPI", "EC2",
-                         "BFIBE", "BB1IBE", "SM9", "SAF", "SDF", "SKF", "SOF", "ZUC", "SERPENT", "SPECK"
+                         "BFIBE", "BB1IBE", "SM9", "SAF", "SDF", "SKF", "SOF", "ZUC", "SERPENT", "SPECK", "BASE58"
                      );
 
 my %disabled_algorithms;