Skip to content

Fix Shadowed Index #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobBarthelmeh merged 1 commit into from
Aug 25, 2025
Merged

Fix Shadowed Index #828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/internal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2698,23 +2698,23 @@ const char* IdToName(byte id)
}


const char* NameByIndexType(byte type, word32* index)
const char* NameByIndexType(byte type, word32* idx)
{
const char* name = NULL;

if (index != NULL) {
if (idx != NULL) {
word32 i, mapSz;

mapSz = (word32)(sizeof(NameIdMap)/sizeof(NameIdPair));

for (i = *index; i < mapSz; i++) {
for (i = *idx; i < mapSz; i++) {
if (NameIdMap[i].type == type) {
name = NameIdMap[i].name;
break;
}
}

*index = i + 1;
*idx = i + 1;
}

return name;
Expand Down
16 changes: 8 additions & 8 deletions src/ssh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2359,27 +2359,27 @@ int wolfSSH_CheckAlgoName(const char* name)
}


const char* wolfSSH_QueryKex(word32* index)
const char* wolfSSH_QueryKex(word32* idx)
{
return NameByIndexType(TYPE_KEX, index);
return NameByIndexType(TYPE_KEX, idx);
}


const char* wolfSSH_QueryKey(word32* index)
const char* wolfSSH_QueryKey(word32* idx)
{
return NameByIndexType(TYPE_KEY, index);
return NameByIndexType(TYPE_KEY, idx);
}


const char* wolfSSH_QueryCipher(word32* index)
const char* wolfSSH_QueryCipher(word32* idx)
{
return NameByIndexType(TYPE_CIPHER, index);
return NameByIndexType(TYPE_CIPHER, idx);
}


const char* wolfSSH_QueryMac(word32* index)
const char* wolfSSH_QueryMac(word32* idx)
{
return NameByIndexType(TYPE_MAC, index);
return NameByIndexType(TYPE_MAC, idx);
}


Expand Down
2 changes: 1 addition & 1 deletion wolfssh/internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ enum NameIdType {

WOLFSSH_LOCAL byte NameToId(const char* name, word32 nameSz);
WOLFSSH_LOCAL const char* IdToName(byte id);
WOLFSSH_LOCAL const char* NameByIndexType(byte type, word32* index);
WOLFSSH_LOCAL const char* NameByIndexType(byte type, word32* idx);


/* For cases when openssl coexist is used */
Expand Down
24 changes: 12 additions & 12 deletions wolfssh/ssh.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,20 +130,20 @@ WOLFSSH_API const char* wolfSSH_GetAlgoListKeyAccepted(WOLFSSH* ssh);

WOLFSSH_API int wolfSSH_CheckAlgoName(const char* name);

WOLFSSH_API const char* wolfSSH_QueryKex(word32* index);
WOLFSSH_API const char* wolfSSH_QueryKey(word32* index);
WOLFSSH_API const char* wolfSSH_QueryCipher(word32* index);
WOLFSSH_API const char* wolfSSH_QueryMac(word32* index);
WOLFSSH_API const char* wolfSSH_QueryKex(word32* idx);
WOLFSSH_API const char* wolfSSH_QueryKey(word32* idx);
WOLFSSH_API const char* wolfSSH_QueryCipher(word32* idx);
WOLFSSH_API const char* wolfSSH_QueryMac(word32* idx);

typedef enum WS_Text {
WOLFSSH_TEXT_KEX_ALGO,
WOLFSSH_TEXT_KEX_CURVE,
WOLFSSH_TEXT_KEX_HASH,

WOLFSSH_TEXT_CRYPTO_IN_CIPHER,
WOLFSSH_TEXT_CRYPTO_IN_MAC,
WOLFSSH_TEXT_CRYPTO_OUT_CIPHER,
WOLFSSH_TEXT_CRYPTO_OUT_MAC,
WOLFSSH_TEXT_KEX_ALGO,
WOLFSSH_TEXT_KEX_CURVE,
WOLFSSH_TEXT_KEX_HASH,

WOLFSSH_TEXT_CRYPTO_IN_CIPHER,
WOLFSSH_TEXT_CRYPTO_IN_MAC,
WOLFSSH_TEXT_CRYPTO_OUT_CIPHER,
WOLFSSH_TEXT_CRYPTO_OUT_MAC,
} WS_Text;

/*
Expand Down
Loading