update to tassl-1.1.1b_v1.3

update by TASS Gujq, 详见tassl_demo/README.
jntass · Jun 7, 2020 · cf9b04c · cf9b04c
1 parent 99a2a97
commit cf9b04c
Show file tree

Hide file tree

Showing 24 changed files with 874 additions and 35 deletions.
diff --git a/README b/README
@@ -91,3 +91,6 @@
  are potentially subject to such restrictions you should seek competent
  professional legal advice before attempting to develop or distribute
  cryptographic code.
+
+
+ ./Configure  linux-x86_64 --prefix=/root/tasshsm_engine/tassl --shared 
diff --git a/apps/apps.h b/apps/apps.h
@@ -594,6 +594,10 @@ void store_setup_crl_download(X509_STORE *st);
 # define FORMAT_HTTP     13                     /* Download using HTTP */
 # define FORMAT_NSS      14                     /* NSS keylog format */
 
+#ifndef OPENSSL_NO_CNSM
+# define FORMAT_BASE64_GM009_7_4     20         /* GM009-2014 7.4 sm2 base64 format */
+#endif
+
 # define EXT_COPY_NONE   0
 # define EXT_COPY_ADD    1
 # define EXT_COPY_ALL    2

diff --git a/apps/opt.c b/apps/opt.c
@@ -199,6 +199,12 @@ int opt_format(const char *s, unsigned long flags, int *result)
     switch (*s) {
     default:
         return 0;
+
+    case 'G':
+    case 'g':
+        *result = FORMAT_BASE64_GM009_7_4;
+        return 1;
+
     case 'D':
     case 'd':
         if ((flags & OPT_FMT_PEMDER) == 0)