fixup! dtls13: move Dtls13NewEpoch into DeriveTls13Keys

rizlik · rizlik · commit 1024bf0109d9 · 2025-06-09T18:00:23.000+02:00
diff --git a/src/tls13.c b/src/tls13.c
@@ -1647,16 +1647,18 @@ int DeriveTls13Keys(WOLFSSL* ssl, int secret, int side, int store)
                     epochNumber = ssl->dtls13PeerEpoch;
                 }
                 else {
-                    return BAD_STATE_E;
+                    ret = BAD_STATE_E;
+                    goto end;
                 }
                 w64Increment(&epochNumber);
                 break;
             default:
-                return BAD_STATE_E;
+                ret = BAD_STATE_E;
+                goto end;
         }
         ret = Dtls13NewEpoch(ssl, epochNumber, side);
         if (ret != 0)
-            return ret;
+            goto end;
     }
 
 #endif /* WOLFSSL_DTLS13 */

Original file line number	Diff line number	Diff line change
`@@ -1647,16 +1647,18 @@ int DeriveTls13Keys(WOLFSSL* ssl, int secret, int side, int store)`
`1647`	`1647`	`epochNumber = ssl->dtls13PeerEpoch;`
`1648`	`1648`	`}`
`1649`	`1649`	`else {`
`1650`		`- return BAD_STATE_E;`
	`1650`	`+ ret = BAD_STATE_E;`
	`1651`	`+ goto end;`
`1651`	`1652`	`}`
`1652`	`1653`	`w64Increment(&epochNumber);`
`1653`	`1654`	`break;`
`1654`	`1655`	`default:`
`1655`		`- return BAD_STATE_E;`
	`1656`	`+ ret = BAD_STATE_E;`
	`1657`	`+ goto end;`
`1656`	`1658`	`}`
`1657`	`1659`	`ret = Dtls13NewEpoch(ssl, epochNumber, side);`
`1658`	`1660`	`if (ret != 0)`
`1659`		`- return ret;`
	`1661`	`+ goto end;`
`1660`	`1662`	`}`
`1661`	`1663`
`1662`	`1664`	`#endif /* WOLFSSL_DTLS13 */`