feedc0de/wolfssl
1
0
Fork 0
forked from wolfSSL/wolfssl
Code Pull Requests Activity

Merge pull request #2483 from JacobBarthelmeh/BuildOptions

Browse Source 
early data and enc-then-mac build fixes
This commit is contained in:
Sean Parkinson
2019-09-27 08:00:53 +10:00
committed by GitHub
parent 9571f2fce8 c6c7f67dfd
commit 1f393c9dde
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ssl.c
View File

@@ -3099,6 +3099,7 @@ void* wolfSSL_GetDecryptVerifyCtx(WOLFSSL* ssl)
return NULL; return NULL;
} }
#if defined(HAVE_ENCRYPT_THEN_MAC) && !defined(WOLFSSL_AEAD_ONLY)
/** /**
* Set the callback, against the context, that encrypts then MACs. * Set the callback, against the context, that encrypts then MACs.
* *
@@ -3175,6 +3176,7 @@ void* wolfSSL_GetVerifyDecryptCtx(WOLFSSL* ssl)
return NULL; return NULL;
} }
#endif /* HAVE_ENCRYPT_THEN_MAC !WOLFSSL_AEAD_ONLY */
@@ -26106,7 +26108,7 @@ int wolfSSL_i2d_SSL_SESSION(WOLFSSL_SESSION* sess, unsigned char** p)
#endif #endif
#endif #endif
#ifdef WOLFSSL_EARLY_DATA #ifdef WOLFSSL_EARLY_DATA
c32toa(sess->maxEarlyDataSz); c32toa(sess->maxEarlyDataSz, data + idx);
idx += OPAQUE32_LEN; idx += OPAQUE32_LEN;
#endif #endif
#endif #endif