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

Merge pull request #525 from ejohnstown/even-more-rsa-userauth 

RFC 8332: Part 2
pull/530/head
David Garske 2023-06-23 09:55:28 -07:00 committed by GitHub
parent 42cc83f5dd a4e194ba96
commit b17f73a585
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 604 additions and 290 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

878
src/internal.c
View File

File diff suppressed because it is too large Load Diff

3
wolfssh/error.h
View File

@ -127,8 +127,9 @@ enum WS_ErrorCodes {
WS_CERT_PROFILE_E = -1086, /* Cert doesn't meet profile reqs */ WS_CERT_PROFILE_E = -1086, /* Cert doesn't meet profile reqs */
WS_CERT_KEY_SIZE_E = -1087, /* Key size error */ WS_CERT_KEY_SIZE_E = -1087, /* Key size error */
WS_CTX_KEY_COUNT_E = -1088, /* Adding too many private keys */ WS_CTX_KEY_COUNT_E = -1088, /* Adding too many private keys */
WS_MATCH_UA_KEY_ID_E = -1089, /* Match user auth key key fail */
WS_LAST_E = -1088 /* Update this to indicate last error */ WS_LAST_E = -1089 /* Update this to indicate last error */
}; };

13
wolfssh/internal.h
View File

@ -312,10 +312,12 @@ enum {
#ifndef WOLFSSH_NO_ECDH_NISTP256_KYBER_LEVEL1_SHA256 #ifndef WOLFSSH_NO_ECDH_NISTP256_KYBER_LEVEL1_SHA256
ID_ECDH_NISTP256_KYBER_LEVEL1_SHA256, ID_ECDH_NISTP256_KYBER_LEVEL1_SHA256,
#endif #endif
ID_EXTINFO_S, /* Pseudo-KEX to indicate server extensions. */
ID_EXTINFO_C, /* Pseudo-KEX to indicate client extensions. */
/* Public Key IDs */ /* Public Key IDs */
ID_SSH_RSA, /* 0x16 */ ID_SSH_RSA,
ID_RSA_SHA2_256, /* 0x17 */ ID_RSA_SHA2_256,
ID_RSA_SHA2_512, ID_RSA_SHA2_512,
ID_ECDSA_SHA2_NISTP256, ID_ECDSA_SHA2_NISTP256,
ID_ECDSA_SHA2_NISTP384, ID_ECDSA_SHA2_NISTP384,
@ -343,6 +345,8 @@ enum {
ID_GLOBREQ_TCPIP_FWD, ID_GLOBREQ_TCPIP_FWD,
ID_GLOBREQ_TCPIP_FWD_CANCEL, ID_GLOBREQ_TCPIP_FWD_CANCEL,
ID_EXTINFO_SERVER_SIG_ALGS,
ID_UNKNOWN ID_UNKNOWN
}; };
@ -727,6 +731,9 @@ struct WOLFSSH {
void* publicKeyCheckCtx; void* publicKeyCheckCtx;
byte sendTerminalRequest; byte sendTerminalRequest;
byte userAuthPkDone; byte userAuthPkDone;
byte sendExtInfo;
byte* peerSigId;
word32 peerSigIdSz;
#ifdef USE_WINDOWS_API #ifdef USE_WINDOWS_API
word32 defaultAttr; /* default windows attributes */ word32 defaultAttr; /* default windows attributes */
@ -879,6 +886,7 @@ WOLFSSH_LOCAL int SendGlobalRequest(WOLFSSH *, const unsigned char *, word32, in
WOLFSSH_LOCAL int SendDebug(WOLFSSH*, byte, const char*); WOLFSSH_LOCAL int SendDebug(WOLFSSH*, byte, const char*);
WOLFSSH_LOCAL int SendServiceRequest(WOLFSSH*, byte); WOLFSSH_LOCAL int SendServiceRequest(WOLFSSH*, byte);
WOLFSSH_LOCAL int SendServiceAccept(WOLFSSH*, byte); WOLFSSH_LOCAL int SendServiceAccept(WOLFSSH*, byte);
WOLFSSH_LOCAL int SendExtInfo(WOLFSSH* ssh);
WOLFSSH_LOCAL int SendUserAuthRequest(WOLFSSH*, byte, int); WOLFSSH_LOCAL int SendUserAuthRequest(WOLFSSH*, byte, int);
WOLFSSH_LOCAL int SendUserAuthSuccess(WOLFSSH*); WOLFSSH_LOCAL int SendUserAuthSuccess(WOLFSSH*);
WOLFSSH_LOCAL int SendUserAuthFailure(WOLFSSH*, byte); WOLFSSH_LOCAL int SendUserAuthFailure(WOLFSSH*, byte);
@ -989,6 +997,7 @@ enum WS_MessageIds {
MSGID_DEBUG = 4, MSGID_DEBUG = 4,
MSGID_SERVICE_REQUEST = 5, MSGID_SERVICE_REQUEST = 5,
MSGID_SERVICE_ACCEPT = 6, MSGID_SERVICE_ACCEPT = 6,
MSGID_EXT_INFO = 7,
MSGID_KEXINIT = 20, MSGID_KEXINIT = 20,
MSGID_NEWKEYS = 21, MSGID_NEWKEYS = 21,