diff --git a/tools/certparse.c b/tools/certparse.c
index 1e0dba56..9c260e17 100644
--- a/tools/certparse.c
+++ b/tools/certparse.c
@@ -56,9 +56,11 @@
 
 int main(void)
 {
-	X509_CERTIFICATE cert;
+	uint8_t cert[1024];
+	size_t certlen;
+
 	for (;;) {
-		int ret = x509_certificate_from_pem(&cert, stdin);
+		int ret = x509_cert_from_pem(cert, &certlen, sizeof(cert), stdin);
 		if (ret < 0) {
 			error_print();
 			return -1;
@@ -67,8 +69,8 @@ int main(void)
 			goto end;
 		}
 		fprintf(stdout, "Certificate\n");
-		x509_certificate_print(stdout, &cert, 0, 0);
-		x509_certificate_to_pem(&cert, stdout);
+		x509_cert_print(stdout, 0, 0, cert, certlen);
+		x509_cert_to_pem(cert, certlen, stdout);
 		fprintf(stdout, "\n");
 	}
 end:
diff --git a/tools/sm2encrypt.c b/tools/sm2encrypt.c
index fcbd97e7..dfa5b777 100644
--- a/tools/sm2encrypt.c
+++ b/tools/sm2encrypt.c
@@ -70,7 +70,8 @@ int main(int argc, char **argv)
 	FILE *certfp = NULL;
 	FILE *infp = stdin;
 	FILE *outfp = stdout;
-	X509_CERTIFICATE cert;
+	uint8_t cert[1024];
+	size_t certlen;
 	SM2_KEY key;
 	uint8_t inbuf[SM2_MAX_PLAINTEXT_SIZE];
 	uint8_t outbuf[SM2_MAX_CIPHERTEXT_SIZE];
@@ -122,11 +123,11 @@ help:
 			error_print();
 			return -1;
 		}
-		if (x509_certificate_from_pem(&cert, certfp) != 1) {
+		if (x509_cert_from_pem(cert, &certlen, sizeof(cert), certfp) != 1) {
 			error_print();
 			return -1;
 		}
-		if (x509_certificate_get_public_key(&cert, &key) != 1) {
+		if (x509_cert_get_subject_public_key(cert, certlen, &key) != 1) {
 			error_print();
 			return -1;
 		}
diff --git a/tools/sm2keygen.c b/tools/sm2keygen.c
index bfde4f24..7e4d956b 100644
--- a/tools/sm2keygen.c
+++ b/tools/sm2keygen.c
@@ -129,7 +129,7 @@ help:
 		}
 	}
 
-	if (sm2_keygen(&key) != 1) {
+	if (sm2_key_generate(&key) != 1) {
 		error_print();
 		return -1;
 	}
diff --git a/tools/sm2sign.c b/tools/sm2sign.c
index 7a712778..2fb6f29f 100644
--- a/tools/sm2sign.c
+++ b/tools/sm2sign.c
@@ -156,7 +156,7 @@ help:
 		return -1;
 	}
 
-	sm2_sign_init(&sign_ctx, &key, id);
+	sm2_sign_init(&sign_ctx, &key, id, strlen(id));
 
 	while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
 		sm2_sign_update(&sign_ctx, buf, len);
diff --git a/tools/sm2verify.c b/tools/sm2verify.c
index 95245c96..96e03ce6 100644
--- a/tools/sm2verify.c
+++ b/tools/sm2verify.c
@@ -74,8 +74,9 @@ int main(int argc, char **argv)
 	FILE *infp = stdin;
 	FILE *sigfp = NULL;
 	SM2_KEY key;
-	X509_CERTIFICATE cert;
 	SM2_SIGN_CTX verify_ctx;
+	uint8_t cert[1024];
+	size_t certlen;
 	uint8_t buf[4096];
 	ssize_t len;
 	uint8_t sig[SM2_MAX_SIGNATURE_SIZE];
@@ -134,11 +135,11 @@ help:
 			error_print();
 			return -1;
 		}
-		if (x509_certificate_from_pem(&cert, certfp) != 1) {
+		if (x509_cert_from_pem(cert, &certlen, sizeof(cert), certfp) != 1) {
 			error_print();
 			return -1;
 		}
-		if (x509_certificate_get_public_key(&cert, &key) != 1) {
+		if (x509_cert_get_subject_public_key(cert, certlen, &key) != 1) {
 			error_print();
 			return -1;
 		}
@@ -167,7 +168,7 @@ help:
 		return -1;
 	}
 
-	sm2_verify_init(&verify_ctx, &key, id);
+	sm2_verify_init(&verify_ctx, &key, id, strlen(id));
 	while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
 		sm2_verify_update(&verify_ctx, buf, len);
 	}
diff --git a/tools/sm3.c b/tools/sm3.c
index 5f1bd5ac..cec1298f 100644
--- a/tools/sm3.c
+++ b/tools/sm3.c
@@ -117,7 +117,7 @@ help:
 			id = SM2_DEFAULT_ID;
 		}
 
-		sm2_compute_z(z, (SM2_POINT *)&sm2_key, id);
+		sm2_compute_z(z, (SM2_POINT *)&sm2_key, id, strlen(id));
 		sm3_update(&sm3_ctx, z, sizeof(z));
 
 	} else {