From 1d023b344deca16a441f00f07909b56610b57bb4 Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 11 Apr 2019 06:02:37 -0700 Subject: [PATCH 1/2] Fix for typo in atmel PK callbacks from PR #2199. --- wolfcrypt/src/port/atmel/atmel.c | 2 +- wolfssl/wolfcrypt/port/atmel/atmel.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wolfcrypt/src/port/atmel/atmel.c b/wolfcrypt/src/port/atmel/atmel.c index 9b7b97a00..c2445d724 100644 --- a/wolfcrypt/src/port/atmel/atmel.c +++ b/wolfcrypt/src/port/atmel/atmel.c @@ -736,7 +736,7 @@ exit: * \brief Verify signature received from peers to prove peer's private key. */ int atcatls_verify_signature_cb(WOLFSSL* ssl, const byte* sig, unsigned int sigSz, - const byte* hash, word32 unsigned int, const byte* key, unsigned int keySz, int* result, + const byte* hash, unsigned int hashSz, const byte* key, unsigned int keySz, int* result, void* ctx) { int ret; diff --git a/wolfssl/wolfcrypt/port/atmel/atmel.h b/wolfssl/wolfcrypt/port/atmel/atmel.h index 598bebac4..5e4c2777d 100644 --- a/wolfssl/wolfcrypt/port/atmel/atmel.h +++ b/wolfssl/wolfcrypt/port/atmel/atmel.h @@ -124,7 +124,7 @@ int atmel_ecc_verify(const byte* message, const byte* signature, int atcatls_sign_certificate_cb(WOLFSSL* ssl, const byte* in, unsigned int inSz, byte* out, word32* outSz, const byte* key, unsigned int keySz, void* ctx); int atcatls_verify_signature_cb(WOLFSSL* ssl, const byte* sig, unsigned int sigSz, - const byte* hash, word32 unsigned int, const byte* key, unsigned int keySz, + const byte* hash, unsigned int hashSz, const byte* key, unsigned int keySz, int* result, void* ctx); int atcatls_set_callbacks(struct WOLFSSL_CTX* ctx); From 02500365bfbd891af660b88a462d598be2aedb8f Mon Sep 17 00:00:00 2001 From: David Garske Date: Thu, 11 Apr 2019 06:15:39 -0700 Subject: [PATCH 2/2] Revert additional atmel.h changes for opaque types in PR #2199. --- wolfssl/wolfcrypt/port/atmel/atmel.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wolfssl/wolfcrypt/port/atmel/atmel.h b/wolfssl/wolfcrypt/port/atmel/atmel.h index 5e4c2777d..6413647e8 100644 --- a/wolfssl/wolfcrypt/port/atmel/atmel.h +++ b/wolfssl/wolfcrypt/port/atmel/atmel.h @@ -115,15 +115,15 @@ int atmel_ecc_verify(const byte* message, const byte* signature, #endif /* WOLFSSL_ATECC508A */ #ifdef HAVE_PK_CALLBACKS - int atcatls_create_key_cb(WOLFSSL* ssl, ecc_key* key, unsigned int keySz, + int atcatls_create_key_cb(struct WOLFSSL* ssl, struct ecc_key* key, unsigned int keySz, int ecc_curve, void* ctx); - int atcatls_create_pms_cb(WOLFSSL* ssl, ecc_key* otherKey, + int atcatls_create_pms_cb(struct WOLFSSL* ssl, struct ecc_key* otherKey, unsigned char* pubKeyDer, word32* pubKeySz, unsigned char* out, word32* outlen, int side, void* ctx); - int atcatls_sign_certificate_cb(WOLFSSL* ssl, const byte* in, unsigned int inSz, + int atcatls_sign_certificate_cb(struct WOLFSSL* ssl, const byte* in, unsigned int inSz, byte* out, word32* outSz, const byte* key, unsigned int keySz, void* ctx); - int atcatls_verify_signature_cb(WOLFSSL* ssl, const byte* sig, unsigned int sigSz, + int atcatls_verify_signature_cb(struct WOLFSSL* ssl, const byte* sig, unsigned int sigSz, const byte* hash, unsigned int hashSz, const byte* key, unsigned int keySz, int* result, void* ctx);