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

WMACRO Update 

1. Fix missing updates to wolfSSHd.
2. Fix missing update to scp.
pull/570/head
John Safranek 2023-09-01 09:19:05 -07:00
parent 0126528c15
commit 491f3dce57
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/wolfsshd/auth.c
View File

@ -511,7 +511,7 @@ static int SearchForPubKey(const char* path, const WS_UserAuthData_PublicKey* pu
} }
if (ret == WSSHD_AUTH_SUCCESS) { if (ret == WSSHD_AUTH_SUCCESS) {
if (WFOPEN(&f, authKeysPath, "rb") != 0) { if (WFOPEN(NULL, &f, authKeysPath, "rb") != 0) {
wolfSSH_Log(WS_LOG_ERROR, "[SSHD] Unable to open %s", wolfSSH_Log(WS_LOG_ERROR, "[SSHD] Unable to open %s",
authKeysPath); authKeysPath);
ret = WS_BAD_FILE_E; ret = WS_BAD_FILE_E;
@ -554,7 +554,7 @@ static int SearchForPubKey(const char* path, const WS_UserAuthData_PublicKey* pu
} }
if (f != WBADFILE) { if (f != WBADFILE) {
WFCLOSE(f); WFCLOSE(NULL, f);
} }
if (ret == WSSHD_AUTH_SUCCESS && !foundKey) { if (ret == WSSHD_AUTH_SUCCESS && !foundKey) {

10
apps/wolfsshd/configuration.c
View File

@ -1114,7 +1114,7 @@ int wolfSSHD_ConfigLoad(WOLFSSHD_CONFIG* conf, const char* filename)
if (conf == NULL || filename == NULL) if (conf == NULL || filename == NULL)
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
if (WFOPEN(&f, filename, "rb") != 0) { if (WFOPEN(NULL, &f, filename, "rb") != 0) {
wolfSSH_Log(WS_LOG_ERROR, "Unable to open SSHD config file %s", wolfSSH_Log(WS_LOG_ERROR, "Unable to open SSHD config file %s",
filename); filename);
return BAD_FUNC_ARG; return BAD_FUNC_ARG;
@ -1146,7 +1146,7 @@ int wolfSSHD_ConfigLoad(WOLFSSHD_CONFIG* conf, const char* filename)
break; break;
} }
} }
WFCLOSE(f); WFCLOSE(NULL, f);
SetAuthKeysPattern(conf->authKeysFile); SetAuthKeysPattern(conf->authKeysFile);
@ -1450,10 +1450,10 @@ void wolfSSHD_ConfigSavePID(const WOLFSSHD_CONFIG* conf)
char buf[12]; /* large enough to hold 'int' type with null terminator */ char buf[12]; /* large enough to hold 'int' type with null terminator */
WMEMSET(buf, 0, sizeof(buf)); WMEMSET(buf, 0, sizeof(buf));
if (WFOPEN(&f, conf->pidFile, "wb") == 0) { if (WFOPEN(NULL, &f, conf->pidFile, "wb") == 0) {
WSNPRINTF(buf, sizeof(buf), "%d", getpid()); WSNPRINTF(buf, sizeof(buf), "%d", getpid());
WFWRITE(buf, 1, WSTRLEN(buf), f); WFWRITE(NULL, buf, 1, WSTRLEN(buf), f);
WFCLOSE(f); WFCLOSE(NULL, f);
} }
} }

2
apps/wolfsshd/wolfsshd.c
View File

@ -1949,7 +1949,7 @@ static int StartSSHD(int argc, char** argv)
break; break;
case 'E': case 'E':
ret = WFOPEN(&logFile, myoptarg, "ab"); ret = WFOPEN(NULL, &logFile, myoptarg, "ab");
if (ret != 0 || logFile == WBADFILE) { if (ret != 0 || logFile == WBADFILE) {
fprintf(stderr, "Unable to open log file %s\n", myoptarg); fprintf(stderr, "Unable to open log file %s\n", myoptarg);
ret = WS_FATAL_ERROR; ret = WS_FATAL_ERROR;

2
src/wolfscp.c
View File

@ -2095,7 +2095,7 @@ int wsScpRecvCallback(WOLFSSH* ssh, int state, const char* basePath,
return ret; return ret;
} }
static int _GetFileSize(WFILE* fp, word32* fileSz) static int _GetFileSize(void* fs, WFILE* fp, word32* fileSz)
{ {
WOLFSSH_UNUSED(fs); WOLFSSH_UNUSED(fs);