|
@@ -3652,9 +3652,9 @@ typedef struct PkCbInfo {
|
|
|
} PkCbInfo;
|
|
|
|
|
|
#if defined(DEBUG_PK_CB) || defined(TEST_PK_PRIVKEY)
|
|
|
- #define WOLFSSL_PKMSG(_f_, ...) printf(_f_, ##__VA_ARGS__)
|
|
|
+ #define WOLFSSL_PKMSG(...) printf(__VA_ARGS__)
|
|
|
#else
|
|
|
- #define WOLFSSL_PKMSG(_f_, ...)
|
|
|
+ #define WOLFSSL_PKMSG(...)
|
|
|
#endif
|
|
|
|
|
|
#ifdef HAVE_ECC
|
|
@@ -4610,15 +4610,15 @@ static WC_INLINE int myGenMaster(WOLFSSL* ssl, void* ctx)
|
|
|
{
|
|
|
int ret;
|
|
|
PkCbInfo* cbInfo = (PkCbInfo*)ctx;
|
|
|
-
|
|
|
+
|
|
|
(void)ssl;
|
|
|
(void)cbInfo;
|
|
|
-
|
|
|
+
|
|
|
WOLFSSL_PKMSG("Gen Master");
|
|
|
/* fall through to original routine */
|
|
|
ret = PROTOCOLCB_UNAVAILABLE;
|
|
|
WOLFSSL_PKMSG("Gen Master: ret %d\n", ret);
|
|
|
-
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -4627,17 +4627,17 @@ static WC_INLINE int myGenPreMaster(WOLFSSL* ssl, byte *premaster,
|
|
|
{
|
|
|
int ret;
|
|
|
PkCbInfo* cbInfo = (PkCbInfo*)ctx;
|
|
|
-
|
|
|
+
|
|
|
(void) ssl;
|
|
|
(void) cbInfo;
|
|
|
(void) premaster;
|
|
|
(void) preSz;
|
|
|
-
|
|
|
+
|
|
|
WOLFSSL_PKMSG("Gen Pre-Master Cb");
|
|
|
/* fall through to original routine */
|
|
|
ret = PROTOCOLCB_UNAVAILABLE;
|
|
|
WOLFSSL_PKMSG("Gen Pre-Master Cb: ret %d\n", ret);
|
|
|
-
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -4645,15 +4645,15 @@ static WC_INLINE int myGenSessionKey(WOLFSSL* ssl, void* ctx)
|
|
|
{
|
|
|
int ret;
|
|
|
PkCbInfo* cbInfo = (PkCbInfo*)ctx;
|
|
|
-
|
|
|
+
|
|
|
(void)ssl;
|
|
|
(void)cbInfo;
|
|
|
-
|
|
|
+
|
|
|
WOLFSSL_PKMSG("Gen Master Cb");
|
|
|
/* fall through to original routine */
|
|
|
ret = PROTOCOLCB_UNAVAILABLE;
|
|
|
WOLFSSL_PKMSG("Gen Master Cb: ret %d\n", ret);
|
|
|
-
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -4661,60 +4661,60 @@ static WC_INLINE int mySetEncryptKeys(WOLFSSL* ssl, void* ctx)
|
|
|
{
|
|
|
int ret;
|
|
|
PkCbInfo* cbInfo = (PkCbInfo*)ctx;
|
|
|
-
|
|
|
+
|
|
|
(void)ssl;
|
|
|
(void)cbInfo;
|
|
|
-
|
|
|
+
|
|
|
WOLFSSL_PKMSG("Set Encrypt Keys Cb");
|
|
|
/* fall through to original routine */
|
|
|
ret = PROTOCOLCB_UNAVAILABLE;
|
|
|
WOLFSSL_PKMSG("Set Encrypt Keys Cb: ret %d\n", ret);
|
|
|
-
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
|
#if !defined(WOLFSSL_NO_TLS12) && !defined(WOLFSSL_AEAD_ONLY)
|
|
|
-static WC_INLINE int myVerifyMac(WOLFSSL *ssl, const byte* message,
|
|
|
+static WC_INLINE int myVerifyMac(WOLFSSL *ssl, const byte* message,
|
|
|
word32 messageSz, word32 macSz, word32 content, void* ctx)
|
|
|
{
|
|
|
int ret;
|
|
|
PkCbInfo* cbInfo = (PkCbInfo*)ctx;
|
|
|
-
|
|
|
+
|
|
|
(void)ssl;
|
|
|
(void)message;
|
|
|
(void)messageSz;
|
|
|
(void)macSz;
|
|
|
(void)content;
|
|
|
(void)cbInfo;
|
|
|
-
|
|
|
+
|
|
|
WOLFSSL_PKMSG("Verify Mac Cb");
|
|
|
/* fall through to original routine */
|
|
|
ret = PROTOCOLCB_UNAVAILABLE;
|
|
|
WOLFSSL_PKMSG("Verify Mac Cb: ret %d\n", ret);
|
|
|
-
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
#endif
|
|
|
|
|
|
static WC_INLINE int myTlsFinished(WOLFSSL* ssl,
|
|
|
- const byte *side,
|
|
|
+ const byte *side,
|
|
|
const byte *handshake_hash,
|
|
|
byte *hashes, void* ctx)
|
|
|
{
|
|
|
int ret;
|
|
|
PkCbInfo* cbInfo = (PkCbInfo*)ctx;
|
|
|
-
|
|
|
+
|
|
|
(void)ssl;
|
|
|
(void)cbInfo;
|
|
|
(void)side;
|
|
|
(void)handshake_hash;
|
|
|
(void)hashes;
|
|
|
-
|
|
|
+
|
|
|
WOLFSSL_PKMSG("Tls Finished Cb");
|
|
|
/* fall through to original routine */
|
|
|
ret = PROTOCOLCB_UNAVAILABLE;
|
|
|
WOLFSSL_PKMSG("Tls Finished Cb: ret %d\n", ret);
|
|
|
-
|
|
|
+
|
|
|
return ret;
|
|
|
}
|
|
|
|
|
@@ -4767,17 +4767,17 @@ static WC_INLINE void SetupPkCallbacks(WOLFSSL_CTX* ctx)
|
|
|
wolfSSL_CTX_SetRsaEncCb(ctx, myRsaEnc);
|
|
|
wolfSSL_CTX_SetRsaDecCb(ctx, myRsaDec);
|
|
|
#endif /* NO_RSA */
|
|
|
-
|
|
|
+
|
|
|
#ifndef NO_CERTS
|
|
|
wolfSSL_CTX_SetGenMasterSecretCb(ctx, myGenMaster);
|
|
|
wolfSSL_CTX_SetGenPreMasterCb(ctx, myGenPreMaster);
|
|
|
wolfSSL_CTX_SetGenSessionKeyCb(ctx, myGenSessionKey);
|
|
|
wolfSSL_CTX_SetEncryptKeysCb(ctx, mySetEncryptKeys);
|
|
|
-
|
|
|
+
|
|
|
#if !defined(WOLFSSL_NO_TLS12) && !defined(WOLFSSL_AEAD_ONLY)
|
|
|
wolfSSL_CTX_SetVerifyMacCb(ctx, myVerifyMac);
|
|
|
#endif
|
|
|
-
|
|
|
+
|
|
|
wolfSSL_CTX_SetTlsFinishedCb(ctx, myTlsFinished);
|
|
|
#endif /* NO_CERTS */
|
|
|
}
|
|
@@ -4819,17 +4819,17 @@ static WC_INLINE void SetupPkCallbackContexts(WOLFSSL* ssl, void* myCtx)
|
|
|
wolfSSL_SetRsaEncCtx(ssl, myCtx);
|
|
|
wolfSSL_SetRsaDecCtx(ssl, myCtx);
|
|
|
#endif /* NO_RSA */
|
|
|
-
|
|
|
+
|
|
|
#ifndef NO_CERTS
|
|
|
wolfSSL_SetGenMasterSecretCtx(ssl, myCtx);
|
|
|
wolfSSL_SetGenPreMasterCtx(ssl, myCtx);
|
|
|
wolfSSL_SetGenSessionKeyCtx(ssl, myCtx);
|
|
|
wolfSSL_SetEncryptKeysCtx(ssl, myCtx);
|
|
|
-
|
|
|
+
|
|
|
#if !defined(WOLFSSL_NO_TLS12) && !defined(WOLFSSL_AEAD_ONLY)
|
|
|
wolfSSL_SetVerifyMacCtx(ssl, myCtx);
|
|
|
#endif
|
|
|
-
|
|
|
+
|
|
|
wolfSSL_SetTlsFinishedCtx(ssl, myCtx);
|
|
|
#endif
|
|
|
}
|