forked from wolfSSL/wolfssl
Merge branch 'master' of https://github.com/wolfSSL/wolfssl into myStack-init-check
This commit is contained in:
@ -753,6 +753,14 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
|
|||||||
done = 1;
|
done = 1;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
/* www.globalsign.com only supports static RSA or ECDHE with AES */
|
||||||
|
/* We cannot expect users to have on static RSA so test for ECC only
|
||||||
|
* as some users will most likely be on 32-bit systems where ECC
|
||||||
|
* is not enabled by default */
|
||||||
|
#if defined(HAVE_OCSP) && !defined(HAVE_ECC)
|
||||||
|
done = 1;
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef NO_PSK
|
#ifndef NO_PSK
|
||||||
done = 1;
|
done = 1;
|
||||||
#endif
|
#endif
|
||||||
|
10
src/ssl.c
10
src/ssl.c
@ -17053,6 +17053,10 @@ int wolfSSL_EC25519_generate_key(unsigned char *priv, unsigned int *privSz,
|
|||||||
{
|
{
|
||||||
#ifndef WOLFSSL_KEY_GEN
|
#ifndef WOLFSSL_KEY_GEN
|
||||||
WOLFSSL_MSG("No Key Gen built in");
|
WOLFSSL_MSG("No Key Gen built in");
|
||||||
|
(void) priv;
|
||||||
|
(void) privSz;
|
||||||
|
(void) pub;
|
||||||
|
(void) pubSz;
|
||||||
return SSL_FAILURE;
|
return SSL_FAILURE;
|
||||||
#else /* WOLFSSL_KEY_GEN */
|
#else /* WOLFSSL_KEY_GEN */
|
||||||
int ret = SSL_FAILURE;
|
int ret = SSL_FAILURE;
|
||||||
@ -17127,6 +17131,12 @@ int wolfSSL_EC25519_shared_key(unsigned char *shared, unsigned int *sharedSz,
|
|||||||
{
|
{
|
||||||
#ifndef WOLFSSL_KEY_GEN
|
#ifndef WOLFSSL_KEY_GEN
|
||||||
WOLFSSL_MSG("No Key Gen built in");
|
WOLFSSL_MSG("No Key Gen built in");
|
||||||
|
(void) shared;
|
||||||
|
(void) sharedSz;
|
||||||
|
(void) priv;
|
||||||
|
(void) privSz;
|
||||||
|
(void) pub;
|
||||||
|
(void) pubSz;
|
||||||
return SSL_FAILURE;
|
return SSL_FAILURE;
|
||||||
#else /* WOLFSSL_KEY_GEN */
|
#else /* WOLFSSL_KEY_GEN */
|
||||||
int ret = SSL_FAILURE;
|
int ret = SSL_FAILURE;
|
||||||
|
@ -794,7 +794,7 @@ AES_192_Key_Expansion PROC
|
|||||||
movdqa [rsp+0], xmm6
|
movdqa [rsp+0], xmm6
|
||||||
|
|
||||||
movdqu xmm1,[rdi]
|
movdqu xmm1,[rdi]
|
||||||
movdqu xmm3,16[rdi]
|
movq xmm3,qword ptr 16[rdi]
|
||||||
movdqa [rsi],xmm1
|
movdqa [rsi],xmm1
|
||||||
movdqa xmm5,xmm3
|
movdqa xmm5,xmm3
|
||||||
|
|
||||||
|
@ -657,7 +657,7 @@ AES_192_Key_Expansion:
|
|||||||
# parameter 2: %rsi
|
# parameter 2: %rsi
|
||||||
|
|
||||||
movdqu (%rdi), %xmm1
|
movdqu (%rdi), %xmm1
|
||||||
movdqu 16(%rdi), %xmm3
|
movq 16(%rdi), %xmm3
|
||||||
movdqa %xmm1, (%rsi)
|
movdqa %xmm1, (%rsi)
|
||||||
movdqa %xmm3, %xmm5
|
movdqa %xmm3, %xmm5
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user