Skip to content

ossh: drop the dead ID_UNKNOWN branch #1352

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

Open
ejohnstown wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ossh: drop the dead ID_UNKNOWN branch #1352

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
3 changes: 0 additions & 3 deletions src/ossh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -736,9 +736,6 @@ int IdentifyOpenSshKey(const byte* in, word32 inSz, void* heap)
if (ret == WS_SUCCESS) {
ret = key->keyId;
}
else if (key->keyId == ID_UNKNOWN) {
ret = WS_UNIMPLEMENTED_E;
}

wolfSSH_KEY_clean(key);
WFREE(key, heap, DYNTYPE_PRIVKEY);
Expand Down
35 changes: 35 additions & 0 deletions tests/unit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,6 +1514,35 @@ static int test_OpenSshFormatNonCompositeRejected(void)
#endif /* !WOLFSSH_NO_ECDSA_SHA2_NISTP256 */


#ifdef WOLFSSH_TEST_INTERNAL
/* An OpenSSH private key whose key-type name wolfSSH does not know is
* WS_UNIMPLEMENTED_E, straight from GetOpenSshKey(). */
static int test_IdentifyOpenSshKeyUnknownName(void)
{
static const byte blob[] = {
'o', 'p', 'e', 'n', 's', 's', 'h', '-', 'k', 'e', 'y', '-',
'v', '1', 0x00,
0x00, 0x00, 0x00, 0x04, 'n', 'o', 'n', 'e', /* ciphername */
0x00, 0x00, 0x00, 0x04, 'n', 'o', 'n', 'e', /* kdfname */
0x00, 0x00, 0x00, 0x00, /* kdfoptions */
0x00, 0x00, 0x00, 0x01, /* key count */
0x00, 0x00, 0x00, 0x00, /* public key */
0x00, 0x00, 0x00, 0x13, /* private list */
0x01, 0x02, 0x03, 0x04, 0x01, 0x02, 0x03, 0x04, /* checkints */
0x00, 0x00, 0x00, 0x07, 's', 's', 'h', '-', 'f', 'o', 'o'
};
int ret;

ret = IdentifyOpenSshKey(blob, (word32)sizeof(blob), NULL);
if (ret != WS_UNIMPLEMENTED_E) {
printf("IdentifyOpenSshKeyUnknownName: wrong result %d\n", ret);
return -120;
}
return 0;
}
#endif /* WOLFSSH_TEST_INTERNAL */


#if defined(WOLFSSH_TEST_INTERNAL) && \
(!defined(WOLFSSH_NO_HMAC_SHA1) || \
!defined(WOLFSSH_NO_HMAC_SHA1_96) || \
Expand Down Expand Up @@ -27125,6 +27154,12 @@ int wolfSSH_UnitTest(int argc, char** argv)
(unitResult == 0 ? "SUCCESS" : "FAILED"));
testResult = testResult || unitResult;
#endif
#ifdef WOLFSSH_TEST_INTERNAL
unitResult = test_IdentifyOpenSshKeyUnknownName();
printf("IdentifyOpenSshKeyUnknownName: %s\n",
(unitResult == 0 ? "SUCCESS" : "FAILED"));
testResult = testResult || unitResult;
#endif

#if defined(WOLFSSH_TEST_INTERNAL) && !defined(NO_WOLFSSH_SERVER)
unitResult = test_ShutdownPeerChannelId();
Expand Down
Loading