Merge pull request #371 from ejohnstown/size-fix

dgarske · web-flow · commit 19b3f3ee6271 · 2021-10-28T10:30:45.000-07:00
Size Calculation Fix
diff --git a/src/internal.c b/src/internal.c
@@ -7434,14 +7434,13 @@ int SendKexDhReply(WOLFSSH* ssh)
         }
     }
 
-    sigBlockSz = (LENGTH_SZ * 2) + sigKeyBlock_ptr->nameSz + sigSz;
-
     if (ret == WS_SUCCESS)
         ret = GenerateKeys(ssh);
 
     /* Get the buffer, copy the packet data, once f is laid into the buffer,
      * add it to the hash and then add K. */
     if (ret == WS_SUCCESS) {
+        sigBlockSz = (LENGTH_SZ * 2) + sigKeyBlock_ptr->nameSz + sigSz;
         payloadSz = MSG_ID_SZ + (LENGTH_SZ * 3) +
                     sigKeyBlock_ptr->sz + fSz + fPad + sigBlockSz;
         ret = PreparePacket(ssh, payloadSz);

Original file line number	Diff line number	Diff line change
`@@ -7434,14 +7434,13 @@ int SendKexDhReply(WOLFSSH* ssh)`
`7434`	`7434`	`}`
`7435`	`7435`	`}`
`7436`	`7436`
`7437`		`- sigBlockSz = (LENGTH_SZ * 2) + sigKeyBlock_ptr->nameSz + sigSz;`
`7438`		`-`
`7439`	`7437`	`if (ret == WS_SUCCESS)`
`7440`	`7438`	`ret = GenerateKeys(ssh);`
`7441`	`7439`
`7442`	`7440`	`/* Get the buffer, copy the packet data, once f is laid into the buffer,`
`7443`	`7441`	`* add it to the hash and then add K. */`
`7444`	`7442`	`if (ret == WS_SUCCESS) {`
	`7443`	`+ sigBlockSz = (LENGTH_SZ * 2) + sigKeyBlock_ptr->nameSz + sigSz;`
`7445`	`7444`	`payloadSz = MSG_ID_SZ + (LENGTH_SZ * 3) +`
`7446`	`7445`	`sigKeyBlock_ptr->sz + fSz + fPad + sigBlockSz;`
`7447`	`7446`	`ret = PreparePacket(ssh, payloadSz);`