update commands

This commit is contained in:
Zhi Guan
2017-03-09 21:14:35 +08:00
parent b2c9d5ab34
commit 7ed2f783b0
4 changed files with 17 additions and 23 deletions

View File

@@ -46,14 +46,11 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* ==================================================================== * ====================================================================
*/ */
/* /*
* Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * gmssl cpk -help
* * gmssl cpk -genmsk <domain> -out <msk>
* Licensed under the OpenSSL license (the "License"). You may not use * gmssl cpk -params -text
* this file except in compliance with the License. You can obtain a copy * gmssl cpk -genkey -in <msk> -id <id>
* in the file LICENSE in the source distribution or at
* https://www.openssl.org/source/license.html
*/ */
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>

View File

@@ -46,14 +46,9 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* ==================================================================== * ====================================================================
*/ */
/* /*
* Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * gmssl otp -setup
* * gmssl otp -genkey
* 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
*/ */
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
@@ -82,8 +77,7 @@ OPTIONS otp_options[] = {
{NULL} {NULL}
}; };
int otp_main(int argc, char **argv)
int sm9_main(int argc, char **argv)
{ {
printf("otp not implemented\n"); printf("otp not implemented\n");
return 0; return 0;

View File

@@ -65,6 +65,7 @@ extern int s_client_main(int argc, char *argv[]);
extern int s_server_main(int argc, char *argv[]); extern int s_server_main(int argc, char *argv[]);
extern int s_time_main(int argc, char *argv[]); extern int s_time_main(int argc, char *argv[]);
extern int sess_id_main(int argc, char *argv[]); extern int sess_id_main(int argc, char *argv[]);
extern int sm9_main(int argc, char *argv[]);
extern int smime_main(int argc, char *argv[]); extern int smime_main(int argc, char *argv[]);
extern int speed_main(int argc, char *argv[]); extern int speed_main(int argc, char *argv[]);
extern int spkac_main(int argc, char *argv[]); extern int spkac_main(int argc, char *argv[]);
@@ -115,6 +116,7 @@ extern OPTIONS s_client_options[];
extern OPTIONS s_server_options[]; extern OPTIONS s_server_options[];
extern OPTIONS s_time_options[]; extern OPTIONS s_time_options[];
extern OPTIONS sess_id_options[]; extern OPTIONS sess_id_options[];
extern OPTIONS sm9_options[];
extern OPTIONS smime_options[]; extern OPTIONS smime_options[];
extern OPTIONS speed_options[]; extern OPTIONS speed_options[];
extern OPTIONS spkac_options[]; extern OPTIONS spkac_options[];
@@ -201,6 +203,9 @@ static FUNCTION functions[] = {
{ FT_general, "s_time", s_time_main, s_time_options }, { FT_general, "s_time", s_time_main, s_time_options },
#endif #endif
{ FT_general, "sess_id", sess_id_main, sess_id_options }, { FT_general, "sess_id", sess_id_main, sess_id_options },
#ifndef OPENSSL_NO_SM9
{ FT_general, "sm9", sm9_main, sm9_options },
#endif
{ FT_general, "smime", smime_main, smime_options }, { FT_general, "smime", smime_main, smime_options },
{ FT_general, "speed", speed_main, speed_options }, { FT_general, "speed", speed_main, speed_options },
{ FT_general, "spkac", spkac_main, spkac_options }, { FT_general, "spkac", spkac_main, spkac_options },

View File

@@ -46,14 +46,12 @@
* OF THE POSSIBILITY OF SUCH DAMAGE. * OF THE POSSIBILITY OF SUCH DAMAGE.
* ==================================================================== * ====================================================================
*/ */
/* /*
* Copyright 2002-2016 The OpenSSL Project Authors. All Rights Reserved. * gmssl sm9 -setup
* * gmssl sm9 -genkey
* Licensed under the OpenSSL license (the "License"). You may not use * gmssl sm9 -encrypt
* this file except in compliance with the License. You can obtain a copy * gmssl sm9 -sign
* in the file LICENSE in the source distribution or at * gmssl sm9 -verify
* https://www.openssl.org/source/license.html
*/ */
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>