This commit is contained in:
Zhi Guan
2016-06-06 22:04:44 +02:00
parent 2bf25bd29f
commit 2cb43b7f80
142 changed files with 7768 additions and 1678 deletions

View File

@@ -76,7 +76,7 @@ static const char *ciphers_usage[] = {
" -ssl2 - SSL2 mode\n",
" -ssl3 - SSL3 mode\n",
" -tls1 - TLS1 mode\n",
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
" -gmssl - GMSSL mode\n",
#endif
NULL
@@ -141,7 +141,7 @@ int MAIN(int argc, char **argv)
else if (strcmp(*argv, "-tls1") == 0)
meth = TLSv1_client_method();
#endif
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
else if (strcmp(*argv, "-gmssl") == 0)
meth = GMSSLv1_client_method();
#endif

View File

@@ -105,7 +105,7 @@
*/
#include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
# include <stdio.h>
# include <stdlib.h>
# include <string.h>
@@ -404,7 +404,7 @@ int MAIN(int argc, char **argv)
apps_shutdown();
OPENSSL_EXIT(ret);
}
#else /* !OPENSSL_NO_GMSSL */
#else /* !NO_GMSSL */
# if PEDANTIC
static void *dummy = &dummy;

View File

@@ -158,7 +158,7 @@
*/
#include <openssl/opensslconf.h> /* for OPENSSL_NO_DH */
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
# include <stdio.h>
# include <stdlib.h>
# include <time.h>
@@ -521,7 +521,7 @@ int MAIN(int argc, char **argv)
}
#else /* !OPENSSL_NO_GMSSL */
#else /* !NO_GMSSL */
# if PEDANTIC
static void *dummy = &dummy;

View File

@@ -344,7 +344,7 @@ int MAIN(int argc, char **argv)
}
if (dgst == NULL) {
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
dgst = EVP_sm3();
#else
dgst = EVP_md5();