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

Type Fix 

When building wolfSSH with g++, it was complaining about type issues
with respect to the type enum wc_HashType. It was getting turned into a
byte and then back to an enum wc_HashType implicitly. It should never
have been a byte in the middle.
pull/482/head
John Safranek 2022-12-22 14:30:36 -08:00
parent 1a3652bbad
commit 5267f6cc4b
No known key found for this signature in database
GPG Key ID: 8CE817DE0D3CCB4A
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/internal.c
View File

@ -4767,9 +4767,10 @@ static int DoUserAuthRequestPassword(WOLFSSH* ssh, WS_UserAuthData* authData,
/* Utility for DoUserAuthRequestPublicKey() */ /* Utility for DoUserAuthRequestPublicKey() */
/* returns negative for error, positive is size of digest. */ /* returns negative for error, positive is size of digest. */
static int DoUserAuthRequestRsa(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk, static int DoUserAuthRequestRsa(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
byte hashId, byte* digest, word32 digestSz) enum wc_HashType hashId, byte* digest,
word32 digestSz)
{ {
enum wc_HashType enmhashId = (enum wc_HashType)hashId; enum wc_HashType enmhashId = hashId;
byte *checkDigest = NULL; byte *checkDigest = NULL;
byte *encDigest = NULL; byte *encDigest = NULL;
int checkDigestSz; int checkDigestSz;
@ -4936,9 +4937,10 @@ static int DoUserAuthRequestRsa(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
#ifdef WOLFSSH_CERTS #ifdef WOLFSSH_CERTS
/* return WS_SUCCESS on success */ /* return WS_SUCCESS on success */
static int DoUserAuthRequestRsaCert(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk, static int DoUserAuthRequestRsaCert(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
byte hashId, byte* digest, word32 digestSz) enum wc_HashType hashId, byte* digest,
word32 digestSz)
{ {
enum wc_HashType enmhashId = (enum wc_HashType)hashId; enum wc_HashType enmhashId = hashId;
byte *checkDigest = NULL; byte *checkDigest = NULL;
byte *encDigest = NULL; byte *encDigest = NULL;
int checkDigestSz; int checkDigestSz;
@ -5107,7 +5109,8 @@ static int DoUserAuthRequestRsaCert(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
/* Utility for DoUserAuthRequestPublicKey() */ /* Utility for DoUserAuthRequestPublicKey() */
/* returns negative for error, positive is size of digest. */ /* returns negative for error, positive is size of digest. */
static int DoUserAuthRequestEcc(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk, static int DoUserAuthRequestEcc(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
byte hashId, byte* digest, word32 digestSz) enum wc_HashType hashId, byte* digest,
word32 digestSz)
{ {
const byte* publicKeyType; const byte* publicKeyType;
word32 publicKeyTypeSz = 0; word32 publicKeyTypeSz = 0;
@ -5270,7 +5273,8 @@ static int DoUserAuthRequestEcc(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
#ifdef WOLFSSH_CERTS #ifdef WOLFSSH_CERTS
static int DoUserAuthRequestEccCert(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk, static int DoUserAuthRequestEccCert(WOLFSSH* ssh, WS_UserAuthData_PublicKey* pk,
byte hashId, byte* digest, word32 digestSz) enum wc_HashType hashId, byte* digest,
word32 digestSz)
{ {
const byte* publicKeyType; const byte* publicKeyType;
word32 publicKeyTypeSz = 0; word32 publicKeyTypeSz = 0;