From ed7bf9302fece0f619e912c4e3aaa45749b4803f Mon Sep 17 00:00:00 2001 From: Zhi Guan Date: Sat, 25 Nov 2017 16:43:19 +0800 Subject: [PATCH] remove java from config --- Configure | 4 +- crypto/base58/base58.c | 1 - crypto/cversion.c | 31 - crypto/evp/e_sms4_ccm.c | 3 +- crypto/sms4/sms4_enc.c | 1 + crypto/sof/sof_lib.c | 2 +- include/openssl/crypto.h | 1 - include/openssl/gmsof.h | 2 +- java/GmSSL.c | 2 +- test/msb-f.msblob | Bin 84 -> 0 bytes test/msb-f.p | 4 - test/msb-ff.dd | Bin 94 -> 0 bytes test/msb-ff.dmsblob | Bin 84 -> 0 bytes test/msb-ff.dp | 4 - test/msb-ff.msblobd | Bin 94 -> 0 bytes test/msb-ff.msblobmsblob | Bin 84 -> 0 bytes test/msb-ff.msblobp | 4 - test/msb-ff.pd | Bin 94 -> 0 bytes test/msb-ff.pp | 4 - test/msb-fff.p | 4 - util/libcrypto.num | 10030 ++++++++++++++++++------------------- util/libssl.num | 819 +-- util/mkdef.pl | 2 +- 23 files changed, 5432 insertions(+), 5486 deletions(-) delete mode 100644 test/msb-f.msblob delete mode 100644 test/msb-f.p delete mode 100644 test/msb-ff.dd delete mode 100644 test/msb-ff.dmsblob delete mode 100644 test/msb-ff.dp delete mode 100644 test/msb-ff.msblobd delete mode 100644 test/msb-ff.msblobmsblob delete mode 100644 test/msb-ff.msblobp delete mode 100644 test/msb-ff.pd delete mode 100644 test/msb-ff.pp delete mode 100644 test/msb-fff.p diff --git a/Configure b/Configure index 8f29a087..decab370 100755 --- a/Configure +++ b/Configure @@ -301,7 +301,7 @@ my $default_ranlib; $config{fips}=0; # Top level directories to build -$config{dirs} = [ "crypto", "ssl", "engines", "apps", "util", "tools", "fuzz", "java" ]; +$config{dirs} = [ "crypto", "ssl", "engines", "apps", "util", "tools", "fuzz" ]; # crypto/ subdirectories to build $config{sdirs} = [ "objects", @@ -481,8 +481,8 @@ our %disabled = ( # "what" => "comment" "zuc" => "default", "skfeng" => "default", "sdfeng" => "default", + "gmieng" => "default", "gmtls" => "default", - "java" => "default", #"engine" => "default", #"sm9" => "default", #"bfibe" => "default", diff --git a/crypto/base58/base58.c b/crypto/base58/base58.c index d1aa3c15..34ca34d2 100755 --- a/crypto/base58/base58.c +++ b/crypto/base58/base58.c @@ -204,7 +204,6 @@ int base58_encode(const void *data, size_t binsz, char *b58, size_t *b58sz) b58[i] = '\0'; *b58sz = i + 1; -end: OPENSSL_free(buf); return 1; } diff --git a/crypto/cversion.c b/crypto/cversion.c index f7fc319e..96d8a5b5 100644 --- a/crypto/cversion.c +++ b/crypto/cversion.c @@ -63,34 +63,3 @@ const char *OpenSSL_version(int t) } return ("not available"); } - -char *GmSSL_version(void) -{ - char *ret = NULL; - int len = 0; - - /* - // use BIO_snprintf, not snprintf, VC does not support this!! - len = snprintf(NULL, 0, "%s\n%s\n%s\n%s\n%s\n%s\n", - OpenSSL_version(0), - OpenSSL_version(1), - OpenSSL_version(2), - OpenSSL_version(3), - OpenSSL_version(4), - OpenSSL_version(5)); - - if (!(ret = OPENSSL_malloc(len))) { - return NULL; - } - - snprintf(ret, len, "%s\n%s\n%s\n%s\n%s\n%s\n", - OpenSSL_version(0), - OpenSSL_version(1), - OpenSSL_version(2), - OpenSSL_version(3), - OpenSSL_version(4), - OpenSSL_version(5)); - */ - - return ret; -} diff --git a/crypto/evp/e_sms4_ccm.c b/crypto/evp/e_sms4_ccm.c index fa3e3820..38786edd 100644 --- a/crypto/evp/e_sms4_ccm.c +++ b/crypto/evp/e_sms4_ccm.c @@ -312,7 +312,7 @@ static int sms4_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out, } } -#define SMS4_CCM_BLOCK_SIZE 1 +#define SMS4_CCM_BLOCK_SIZE 16 #define SMS4_CCM_IV_LENGTH 12 #define SMS4_CCM_FLAGS (EVP_CIPH_FLAG_DEFAULT_ASN1 \ @@ -335,6 +335,7 @@ static const EVP_CIPHER sms4_ccm = { }; const EVP_CIPHER *EVP_sms4_ccm(void) { + return NULL; return &sms4_ccm; } #endif /* OPENSSL_NO_SMS4 */ diff --git a/crypto/sms4/sms4_enc.c b/crypto/sms4/sms4_enc.c index f07c0be8..36ce7f55 100644 --- a/crypto/sms4/sms4_enc.c +++ b/crypto/sms4/sms4_enc.c @@ -47,6 +47,7 @@ * ==================================================================== */ +#include #include #include "sms4_lcl.h" diff --git a/crypto/sof/sof_lib.c b/crypto/sof/sof_lib.c index 67157708..88a83d8d 100644 --- a/crypto/sof/sof_lib.c +++ b/crypto/sof/sof_lib.c @@ -561,7 +561,7 @@ static ERR_STRING_DATA sof_errstr[] = { { SOR_LoadProviderErr, "Load provider error" }, }; -char *SOF_GetErrorString(int err) +const char *SOF_GetErrorString(int err) { int i; for (i = 0; i < OSSL_NELEM(sof_errstr); i++) { diff --git a/include/openssl/crypto.h b/include/openssl/crypto.h index 6351eae0..60ac4911 100644 --- a/include/openssl/crypto.h +++ b/include/openssl/crypto.h @@ -166,7 +166,6 @@ const char *OpenSSL_version(int type); # define OPENSSL_PLATFORM 3 # define OPENSSL_DIR 4 # define OPENSSL_ENGINES_DIR 5 -char *GmSSL_version(void); int OPENSSL_issetugid(void); diff --git a/include/openssl/gmsof.h b/include/openssl/gmsof.h index 89819e31..6bdff90f 100644 --- a/include/openssl/gmsof.h +++ b/include/openssl/gmsof.h @@ -80,7 +80,7 @@ extern "C" { #endif - +const char *SOF_GetErrorString(int err); /* BEGIN ERROR CODES */ /* diff --git a/java/GmSSL.c b/java/GmSSL.c index 9c1de5c0..8905192d 100755 --- a/java/GmSSL.c +++ b/java/GmSSL.c @@ -1532,7 +1532,7 @@ JNIEXPORT jbyteArray JNICALL Java_GmSSL_deriveKey( int ecdh_kdf_type; int ecdh_kdf_md; int ecdh_kdf_outlen; - unsigned char *ecdh_kdf_ukm; + char *ecdh_kdf_ukm; int ecdh_kdf_ukm_len; diff --git a/test/msb-f.msblob b/test/msb-f.msblob deleted file mode 100644 index 426df280b22fc53f49cdb60f22b530002826b33c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 84 zcmZQ$Vqjoc!oUy|>}bdUWHSPxZS1-e_kGscXo*xc5pwD>~oDW=_9#sB)9m>*EU oDA8VX?*8(FhjSx0-+1{?*5J|ZAO6{5(DaSbZNtH*-_Cr87y)olpU6)A7qz}bdUWHSPxZS1-e_kGscXo*xc5pwD>~oDW=_9#sB)9m>*EU oDA8VX?*8(FhjSx0-+1{?*5J|ZAO6{5(DaSbZNtH*-_Cr87y)olpU6)A7qz}bdUWHSPxZS1-e_kGscXo*xc5pwD>~oDW=_9#sB)9m>*EU oDA8VX?*8(FhjSx0-+1{?*5J|ZAO6{5(DaSbZNtH*-_Cr87y)olpU6)A7qz