Merge pull request #841 from LinuxJedi/agent-lock-fix

dgarske · web-flow · commit 05d02892eb61 · 2025-10-14T12:51:24.000-07:00
Fix overflow in PostLock / PostUnlock
diff --git a/src/agent.c b/src/agent.c
@@ -366,6 +366,7 @@ static int PostSuccess(WOLFSSH_AGENT_CTX* agent)
 }
 
 
+/* Stub that has not yet been implemented */
 static int PostLock(WOLFSSH_AGENT_CTX* agent,
         const byte* passphrase, word32 passphraseSz)
 {
@@ -378,14 +379,15 @@ static int PostLock(WOLFSSH_AGENT_CTX* agent,
     if (passphraseSz < ppSz)
         ppSz = passphraseSz;
 
-    WMEMCPY(pp, passphrase, passphraseSz);
+    WMEMCPY(pp, passphrase, ppSz);
     pp[ppSz] = 0;
     WLOG(WS_LOG_AGENT, "Locking with passphrase '%s'", pp);
 
     return WS_SUCCESS;
 }
 
 
+/* Stub that has not yet been implemented */
 static int PostUnlock(WOLFSSH_AGENT_CTX* agent,
         const byte* passphrase, word32 passphraseSz)
 {
@@ -398,7 +400,7 @@ static int PostUnlock(WOLFSSH_AGENT_CTX* agent,
     if (passphraseSz < ppSz)
         ppSz = passphraseSz;
 
-    WMEMCPY(pp, passphrase, passphraseSz);
+    WMEMCPY(pp, passphrase, ppSz);
     pp[ppSz] = 0;
     WLOG(WS_LOG_AGENT, "Unlocking with passphrase '%s'", pp);
 

Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,7 @@ static int PostSuccess(WOLFSSH_AGENT_CTX* agent)`
`366`	`366`	`}`
`367`	`367`
`368`	`368`
	`369`	`+/* Stub that has not yet been implemented */`
`369`	`370`	`static int PostLock(WOLFSSH_AGENT_CTX* agent,`
`370`	`371`	`const byte* passphrase, word32 passphraseSz)`
`371`	`372`	`{`
`@@ -378,14 +379,15 @@ static int PostLock(WOLFSSH_AGENT_CTX* agent,`
`378`	`379`	`if (passphraseSz < ppSz)`
`379`	`380`	`ppSz = passphraseSz;`
`380`	`381`
`381`		`- WMEMCPY(pp, passphrase, passphraseSz);`
	`382`	`+ WMEMCPY(pp, passphrase, ppSz);`
`382`	`383`	`pp[ppSz] = 0;`
`383`	`384`	`WLOG(WS_LOG_AGENT, "Locking with passphrase '%s'", pp);`
`384`	`385`
`385`	`386`	`return WS_SUCCESS;`
`386`	`387`	`}`
`387`	`388`
`388`	`389`
	`390`	`+/* Stub that has not yet been implemented */`
`389`	`391`	`static int PostUnlock(WOLFSSH_AGENT_CTX* agent,`
`390`	`392`	`const byte* passphrase, word32 passphraseSz)`
`391`	`393`	`{`
`@@ -398,7 +400,7 @@ static int PostUnlock(WOLFSSH_AGENT_CTX* agent,`
`398`	`400`	`if (passphraseSz < ppSz)`
`399`	`401`	`ppSz = passphraseSz;`
`400`	`402`
`401`		`- WMEMCPY(pp, passphrase, passphraseSz);`
	`403`	`+ WMEMCPY(pp, passphrase, ppSz);`
`402`	`404`	`pp[ppSz] = 0;`
`403`	`405`	`WLOG(WS_LOG_AGENT, "Unlocking with passphrase '%s'", pp);`
`404`	`406`