remove java from config

This commit is contained in:
Zhi Guan
2017-11-25 16:43:19 +08:00
parent 2458fcb879
commit ed7bf9302f
23 changed files with 5432 additions and 5486 deletions

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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 */

View File

@@ -47,6 +47,7 @@
* ====================================================================
*/
#include <stdio.h>
#include <openssl/sms4.h>
#include "sms4_lcl.h"

View File

@@ -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++) {