Add SKF support

tools/gmssl.c

@@ -83,6 +83,7 @@ extern int tls12_server_main(int argc, char **argv);
 extern int tls13_client_main(int argc, char **argv);
 extern int tls13_server_main(int argc, char **argv);
 extern int sdfutil_main(int argc, char **argv);
+extern int skfutil_main(int argc, char **argv);
 
 
 static const char *options =
@@ -121,7 +122,8 @@ static const char *options =
 	"  tls12_server    TLS 1.2 server\n"
 	"  tls13_client    TLS 1.3 client\n"
 	"  tls13_server    TLS 1.3 server\n"
-	"  sdfutil         SDF crypto device utility\n";
+	"  sdfutil         SDF crypto device utility\n"
+	"  skfutil         SKF crypto device utility\n";
 
 
 
@@ -204,6 +206,8 @@ int main(int argc, char **argv)
 			return tls13_server_main(argc, argv);
 		} else if (!strcmp(*argv, "sdfutil")) {
 			return sdfutil_main(argc, argv);
+		} else if (!strcmp(*argv, "skfutil")) {
+			return skfutil_main(argc, argv);
 		} else {
 			fprintf(stderr, "%s: illegal option '%s'\n", prog, *argv);
 			fprintf(stderr, "usage: %s %s\n", prog, options);

tools/sdfutil.c

@@ -182,7 +182,11 @@ bad:
 		break;
 
 	case OP_EXPORTPUBKEY:
-		sdf_load_key(&dev, &key, keyindex, pass);
+		if (keyindex < 0) {
+			error_print();
+			goto end;
+		}
+		sdf_load_sign_key(&dev, &key, keyindex, pass);
 		sm2_public_key_info_to_pem(&(key.public_key), outfp);
 		break;
 
@@ -193,7 +197,7 @@ bad:
 		uint8_t sig[SM2_MAX_SIGNATURE_SIZE];
 		size_t siglen;
 
-		sdf_load_key(&dev, &key, keyindex, pass);
+		sdf_load_sign_key(&dev, &key, keyindex, pass);
 
 		sm3_init(&sm3_ctx);
 		sm2_compute_z(dgst, &(key.public_key.public_key), id, strlen(id));

tools/skfutil.c

@@ -0,0 +1,271 @@
+/*
+ * Copyright (c) 2014 - 2021 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 <stdlib.h>
+#include <string.h>
+#include <gmssl/hex.h>
+#include <gmssl/sm2.h>
+#include <gmssl/sm3.h>
+#include <gmssl/skf.h>
+#include <gmssl/error.h>
+
+
+#define OP_NONE			0
+#define OP_DEVINFO		1
+#define OP_EXPORTPUBKEY		2
+#define OP_SIGN			3
+#define OP_RAND			4
+
+
+
+static void print_usage(FILE *fp, const char *prog)
+{
+	fprintf(fp, "usage:\n");
+	fprintf(fp, "  %s -lib so_path -dev str -devinfo\n", prog);
+	fprintf(fp, "  %s -lib so_path -dev str -app str [-pass str] -container str -exportpubkey [-out file]\n", prog);
+	fprintf(fp, "  %s -lib so_path -dev str -app str [-pass str] -container str -sign [-in file] [-out file]\n", prog);
+	fprintf(fp, "  %s -lib so_path -dev str -rand num [-out file]\n", prog);
+}
+
+int skfutil_main(int argc, char **argv)
+{
+	int ret = 1;
+	char *prog = argv[0];
+	char *lib = NULL;
+	int op = 0;
+	char *devname = NULL;
+	char *authkeystr = NULL;
+	char *appname = NULL;
+	char *container_name = NULL;
+	char *pass = NULL;
+	char *id = SM2_DEFAULT_ID;
+	int num = 0;
+	char *infile = NULL;
+	char *outfile = NULL;
+	FILE *infp = stdin;
+	FILE *outfp = stdout;
+	unsigned char buf[4096];
+	unsigned int ulen;
+	int len;
+
+	uint8_t authkey[16];
+	size_t authkeylen;
+	SKF_DEVICE dev;
+	SKF_KEY key;
+
+
+	argc--;
+	argv++;
+	if (argc < 1) {
+bad:
+		print_usage(stderr, prog);
+		return 1;
+	}
+
+	while (argc > 0) {
+		if (!strcmp(*argv, "-help")) {
+			print_usage(stdout, prog);
+			goto end;
+		} else if (!strcmp(*argv, "-lib")) {
+			if (--argc < 1) goto bad;
+			lib = *(++argv);
+		} else if (!strcmp(*argv, "-lib")) {
+			if (--argc < 1) goto bad;
+			devname = *(++argv);
+		} else if (!strcmp(*argv, "-devinfo")) {
+			op = OP_DEVINFO;
+		} else if (!strcmp(*argv, "-dev")) {
+			if (--argc < 1) goto bad;
+			devname = *(++argv);
+		} else if (!strcmp(*argv, "-authkey")) {
+			if (--argc < 1) goto bad;
+			authkeystr = *(++argv);
+			if (strlen(authkeystr) != 32) {
+				error_print();
+				return -1;
+			}
+			hex_to_bytes(authkeystr, strlen(authkeystr), authkey, &authkeylen);
+		} else if (!strcmp(*argv, "-exportpubkey")) {
+			op = OP_EXPORTPUBKEY;
+		} else if (!strcmp(*argv, "-sign")) {
+			op = OP_SIGN;
+		} else if (!strcmp(*argv, "-app")) {
+			if (--argc < 1) goto bad;
+			appname = *(++argv);
+		} else if (!strcmp(*argv, "-container")) {
+			if (--argc < 1) goto bad;
+			container_name = *(++argv);
+		} else if (!strcmp(*argv, "-pass")) {
+			if (--argc < 1) goto bad;
+			pass = *(++argv);
+		} else if (!strcmp(*argv, "-id")) {
+			if (--argc < 1) goto bad;
+			id = *(++argv);
+		} else if (!strcmp(*argv, "-rand")) {
+			if (--argc < 1) goto bad;
+			len = atoi(*(++argv));
+		} else if (!strcmp(*argv, "-in")) {
+			if (--argc < 1) goto bad;
+			infile = *(++argv);
+		} else if (!strcmp(*argv, "-out")) {
+			if (--argc < 1) goto bad;
+			outfile = *(++argv);
+
+		} else {
+			break;
+		}
+
+		argc--;
+		argv++;
+	}
+
+	if (argc) {
+		fprintf(stderr, "%s: invalid option '%s'\n", prog, *argv);
+		return 1;
+	}
+
+	if (!lib) {
+		fprintf(stderr, "Option '-lib' required\n");
+		goto bad;
+	}
+	if (skf_load_library(lib, NULL) != 1) {
+		error_print();
+		goto end;
+	}
+
+	if (infile) {
+		if (!(infp = fopen(infile, "rb"))) {
+			error_print();
+			return -1;
+		}
+	}
+
+	if (outfile) {
+		if (!(outfp = fopen(outfile, "wb"))) {
+			error_print();
+			return -1;
+		}
+	}
+
+	if (!op) {
+		error_print();
+		goto bad;
+	}
+
+
+	if (!devname) {
+		error_print();
+		goto bad;
+	}
+	if (op == OP_DEVINFO) {
+		skf_print_device_info(stdout, 0, 0, devname);
+		ret = 0;
+		goto end;
+	}
+
+	if (skf_open_device(&dev, devname, authkey) != 1) {
+		error_print();
+		return -1;
+	}
+
+	if (op == OP_RAND) {
+		skf_rand_bytes(&dev, buf, len);
+		fwrite(buf, 1, len, outfp);
+		ret = 0;
+		goto end;
+	}
+
+	if (!appname) {
+		error_print();
+		goto bad;
+	}
+	if (!container_name) {
+		error_print();
+		goto bad;
+	}
+	if (!pass) {
+		error_print();
+		goto bad;
+	}
+
+	if (op == OP_EXPORTPUBKEY) {
+		skf_load_sign_key(&dev, appname, pass, container_name, &key);
+		sm2_public_key_info_to_pem(&(key.public_key), outfp);
+		ret = 0;
+		goto end;
+	}
+
+	if (op == OP_SIGN) {
+		SM3_CTX sm3_ctx;
+		uint8_t dgst[32];
+		uint8_t sig[SM2_MAX_SIGNATURE_SIZE];
+		size_t siglen;
+
+		skf_load_sign_key(&dev, appname, pass, container_name, &key);
+
+		sm3_init(&sm3_ctx);
+		sm2_compute_z(dgst, &(key.public_key.public_key), id, strlen(id));
+		sm3_update(&sm3_ctx, dgst, sizeof(dgst));
+
+		while ((len = fread(buf, 1, sizeof(buf), infp)) > 0) {
+			sm3_update(&sm3_ctx, buf, len);
+		}
+		sm3_finish(&sm3_ctx, dgst);
+
+		if ((ret = skf_sign(&key, dgst, sig, &siglen)) != 1) {
+			error_print();
+			return -1;
+		}
+		ret = 0;
+	}
+
+end:
+	return ret;
+}

tools/sm4.c

@@ -138,7 +138,7 @@ bad:
 		return -1;
 	}
 	if (strlen(keystr) != 32) {
-		printf("keystr len = %d\n", strlen(keystr));
+		printf("keystr len = %zu\n", strlen(keystr));
 		error_print();
 		return -1;
 	}

tools/zuc.c

@@ -118,7 +118,7 @@ bad:
 		return -1;
 	}
 	if (strlen(keystr) != 32) {
-		printf("keystr len = %d\n", strlen(keystr));
+		printf("keystr len = %zu\n", strlen(keystr));
 		error_print();
 		return -1;
 	}