mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

don't allow scr and fake indication together

Browse Source
This commit is contained in:
toddouska 2014-10-02 10:18:11 -07:00
parent 9dbc1d2d00
commit 668fed4796
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -2,6 +2,7 @@
*.lo *.lo
*.la *.la
*.o *.o
*.patch
*.deps *.deps
*.libs *.libs
*.cache *.cache

4
configure.ac
View File

@ -1342,6 +1342,10 @@ AC_ARG_ENABLE([secure-renegotiation],
if test "x$ENABLED_SECURE_RENEGOTIATION" = "xyes" if test "x$ENABLED_SECURE_RENEGOTIATION" = "xyes"
then then
if test "x$ENABLED_RENEGOTIATION_INDICATION" = "xyes"
then
AC_MSG_ERROR([cannot enable renegotiation-indication and secure-renegotiation.])
fi
AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SECURE_RENEGOTIATION" AM_CFLAGS="$AM_CFLAGS -DHAVE_TLS_EXTENSIONS -DHAVE_SECURE_RENEGOTIATION"
fi fi

4
src/internal.c
View File

@ -63,6 +63,10 @@
CYASSL_CALLBACKS needs LARGE_STATIC_BUFFERS, please add LARGE_STATIC_BUFFERS CYASSL_CALLBACKS needs LARGE_STATIC_BUFFERS, please add LARGE_STATIC_BUFFERS
#endif #endif
#if defined(HAVE_SECURE_RENEGOTIATION) && defined(HAVE_RENEGOTIATION_INDICATION)
#error Cannot use both secure-renegotiation and renegotiation-indication
#endif
static int BuildMessage(CYASSL* ssl, byte* output, int outSz, static int BuildMessage(CYASSL* ssl, byte* output, int outSz,
const byte* input, int inSz, int type); const byte* input, int inSz, int type);