WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Un-interleave and comment alignment

pull/408/head
Anthony Hu 2022-05-20 11:14:13 -04:00
parent 19a5938419
commit 3cd804bd8d
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/internal.c
View File

@ -3317,8 +3317,9 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
#else
ret = WS_INVALID_ALGO_ID;
#endif
}
#ifndef WOLFSSH_NO_SABER_LEVEL1_SHA256
} else if (ssh->handshake->useSaber) {
else if (ssh->handshake->useSaber) {
/* This is a KEM. In this case, I need to decapsulate the
* ciphertext. */
OQS_KEM* kem = NULL;
@ -3345,8 +3346,9 @@ static int DoKexDhReply(WOLFSSH* ssh, byte* buf, word32 len, word32* idx)
if (ret == 0) {
ssh->kSz = kem->length_shared_secret;
}
}
#endif
} else {
else {
ret = WS_INVALID_ALGO_ID;
}
}
@ -7430,8 +7432,9 @@ int SendKexDhReply(WOLFSSH* ssh)
privKey = NULL;
#endif
#endif /* !defined(WOLFSSH_NO_ECDH) */
}
#ifndef WOLFSSH_NO_SABER_LEVEL1_SHA256
} else if (useSaber) {
else if (useSaber) {
/* This is a KEM. In this case, I need to encapsulate the
* shared secret. */
OQS_KEM* kem = NULL;
@ -7461,8 +7464,9 @@ int SendKexDhReply(WOLFSSH* ssh)
ssh->kSz = kem->length_shared_secret;
fSz = kem->length_ciphertext;
}
}
#endif
} else {
else {
/* This should never happen */
ret = WS_ERROR;
}
@ -8103,16 +8107,15 @@ int SendKexDhInit(WOLFSSH* ssh)
#else
ret = WS_INVALID_ALGO_ID;
#endif /* !defined(WOLFSSH_NO_ECDH) */
}
#ifndef WOLFSSH_NO_SABER_LEVEL1_SHA256
} else if (ssh->handshake->useSaber) {
else if (ssh->handshake->useSaber) {
OQS_KEM* kem = NULL;
ret = 0;
if (ret == 0) {
kem = OQS_KEM_new(OQS_KEM_alg_saber_lightsaber);
if (kem == NULL) {
ret = WS_INVALID_ALGO_ID;
}
kem = OQS_KEM_new(OQS_KEM_alg_saber_lightsaber);
if (kem == NULL) {
ret = WS_INVALID_ALGO_ID;
}
if (ret == 0) {
@ -8124,8 +8127,9 @@ int SendKexDhInit(WOLFSSH* ssh)
eSz = kem->length_public_key;
ssh->handshake->xSz = kem->length_secret_key;
}
}
#endif
} else {
else {
ret = WS_INVALID_ALGO_ID;
}

2
wolfssh/internal.h
View File

@ -418,7 +418,7 @@ struct WOLFSSH_CTX {
word32 privateKeySz;
byte useEcc; /* Depends on the private key */
#ifndef WOLFSSH_NO_SABER_LEVEL1_SHA256
byte useSaber:1; /* Depends on the private key */
byte useSaber:1; /* Depends on the private key */
#endif
word32 highwaterMark;
const char* banner;