abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-07 00:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

add CBC-MAC and GM OTP, not tested

Browse Source
This commit is contained in:
Zhi Guan
2016-05-15 20:21:51 +02:00
parent 8c0439e7d6
commit 60d14da0cc
81 changed files with 2789 additions and 1401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/ciphers.c
View File

@@ -76,6 +76,9 @@ static const char *ciphers_usage[] = {
" -ssl2 - SSL2 mode\n",
" -ssl3 - SSL3 mode\n",
" -tls1 - TLS1 mode\n",
#ifndef OPENSSL_NO_GMSSL
" -gmssl - GMSSL mode\n",
#endif
NULL
};
@@ -137,6 +140,10 @@ int MAIN(int argc, char **argv)
#ifndef OPENSSL_NO_TLS1
else if (strcmp(*argv, "-tls1") == 0)
meth = TLSv1_client_method();
#endif
#ifndef OPENSSL_NO_GMSSL
else if (strcmp(*argv, "-gmssl") == 0)
meth = GMSSLv1_client_method();
#endif
else if ((strncmp(*argv, "-h", 2) == 0) || (strcmp(*argv, "-?") == 0)) {
badops = 1;

76
apps/cpkparam.c
View File

@@ -178,39 +178,25 @@
# undef PROG
# define PROG cpkparam_main
# define DEFBITS 2048
/*-
* -inform arg - input format - default PEM (DER or PEM)
* -outform arg - output format - default PEM
* -in arg - input file - default stdin
* -id - domain identifier
* -algorithm - public key algorithm
* -pkeyopt - public key options
* -paramfile - public key parameters
* -out arg - output file - default stdout
* -dsaparam - read or generate DSA parameters, convert to DH
* -check - check the parameters are ok
* -noout
* -text
* -C
*/
static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb);
int MAIN(int, char **);
int MAIN(int argc, char **argv)
{
DH *dh = NULL;
int i, badops = 0, text = 0;
# ifndef OPENSSL_NO_DSA
int dsaparam = 0;
# endif
BIO *in = NULL, *out = NULL;
int informat, outformat, check = 0, noout = 0, C = 0, ret = 1;
char *infile, *outfile, *prog;
char *inrand = NULL;
# ifndef OPENSSL_NO_ENGINE
char *engine = NULL;
# endif
int num = 0, g = 0;
char *id = NULL;
apps_startup();
@@ -221,10 +207,7 @@ int MAIN(int argc, char **argv)
if (!load_config(bio_err, NULL))
goto end;
infile = NULL;
outfile = NULL;
informat = FORMAT_PEM;
outformat = FORMAT_PEM;
prog = argv[0];
argc--;
@@ -247,21 +230,12 @@ int MAIN(int argc, char **argv)
goto bad;
outfile = *(++argv);
}
# ifndef OPENSSL_NO_ENGINE
else if (strcmp(*argv, "-engine") == 0) {
if (--argc < 1)
goto bad;
engine = *(++argv);
}
# endif
else if (strcmp(*argv, "-check") == 0)
check = 1;
else if (strcmp(*argv, "-text") == 0)
text = 1;
# ifndef OPENSSL_NO_DSA
else if (strcmp(*argv, "-dsaparam") == 0)
dsaparam = 1;
# endif
else if (strcmp(*argv, "-C") == 0)
C = 1;
else if (strcmp(*argv, "-noout") == 0)
@@ -289,10 +263,8 @@ int MAIN(int argc, char **argv)
" -outform arg output format - one of DER PEM\n");
BIO_printf(bio_err, " -in arg input file\n");
BIO_printf(bio_err, " -out arg output file\n");
# ifndef OPENSSL_NO_DSA
BIO_printf(bio_err,
" -dsaparam read or generate DSA parameters, convert to DH\n");
# endif
BIO_printf(bio_err, " -check check the DH parameters\n");
BIO_printf(bio_err,
" -text print a text form of the DH parameters\n");
@@ -303,10 +275,6 @@ int MAIN(int argc, char **argv)
" -5 generate parameters using 5 as the generator value\n");
BIO_printf(bio_err,
" numbits number of bits in to generate (default 2048)\n");
# ifndef OPENSSL_NO_ENGINE
BIO_printf(bio_err,
" -engine e use engine e, possibly a hardware device.\n");
# endif
BIO_printf(bio_err, " -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR,
LIST_SEPARATOR_CHAR);
BIO_printf(bio_err,
@@ -318,14 +286,9 @@ int MAIN(int argc, char **argv)
ERR_load_crypto_strings();
# ifndef OPENSSL_NO_ENGINE
setup_engine(bio_err, engine, 0);
# endif
if (g && !num)
num = DEFBITS;
# ifndef OPENSSL_NO_DSA
if (dsaparam) {
if (g) {
BIO_printf(bio_err,
@@ -333,7 +296,6 @@ int MAIN(int argc, char **argv)
goto end;
}
} else
# endif
{
/* DH parameters */
if (num && !g)
@@ -454,12 +416,6 @@ int MAIN(int argc, char **argv)
}
if (outfile == NULL) {
BIO_set_fp(out, stdout, BIO_NOCLOSE);
# ifdef OPENSSL_SYS_VMS
{
BIO *tmpbio = BIO_new(BIO_f_linebuffer());
out = BIO_push(tmpbio, out);
}
# endif
} else {
if (BIO_write_filename(out, outfile) <= 0) {
perror(outfile);
@@ -564,26 +520,6 @@ int MAIN(int argc, char **argv)
OPENSSL_EXIT(ret);
}
/* dh_cb is identical to dsa_cb in apps/dsaparam.c */
static int MS_CALLBACK dh_cb(int p, int n, BN_GENCB *cb)
{
char c = '*';
if (p == 0)
c = '.';
if (p == 1)
c = '+';
if (p == 2)
c = '*';
if (p == 3)
c = '\n';
BIO_write(cb->arg, &c, 1);
(void)BIO_flush(cb->arg);
# ifdef LINT
p = n;
# endif
return 1;
}
#else /* !OPENSSL_NO_GMSSL */

21
apps/pkeyutl.c
View File

@@ -72,9 +72,6 @@ static void usage(void);
#define PROG pkeyutl_main
#ifndef OPENSSL_NO_GMSSL
int is_sm2 = 0;
#endif
static EVP_PKEY_CTX *init_ctx(int *pkeysize,
char *keyfile, int keyform, int key_type,
@@ -210,14 +207,6 @@ int MAIN(int argc, char **argv)
ERR_print_errors(bio_err);
goto end;
}
#ifndef OPENSSL_NO_GMSSL
} else if (strcmp(*argv, "-algorithm") == 0) {
if (!argv[1])
goto end;
if (strcmp(*(++argv), "SM2"))
goto end;
is_sm2 = 1;
#endif
} else
badarg = 1;
if (badarg) {
@@ -431,16 +420,6 @@ static EVP_PKEY_CTX *init_ctx(int *pkeysize,
if (!pkey)
goto end;
#ifndef OPENSSL_NO_GMSSL
if (is_sm2) {
if (!EVP_PKEY_set_type(pkey, EVP_PKEY_SM2)) {
fprintf(stderr, "GmSSL: %s %d\n", __FILE__, __LINE__);
ERR_print_errors_fp(stderr);
goto end;
}
}
#endif
ctx = EVP_PKEY_CTX_new(pkey, e);
EVP_PKEY_free(pkey);