Merge branch 'etm' into dtls

* etm:
  Fix some more warnings in reduced configs
  Fix typo causing MSVC errors
This commit is contained in:
Manuel Pégourié-Gonnard 2014-11-17 15:07:17 +01:00
commit 0975ad928d
2 changed files with 21 additions and 22 deletions

View file

@ -147,7 +147,7 @@ struct options
uint32_t hs_to_max; /* Max value of DTLS handshake timer */
int fallback; /* is this a fallback connection? */
char extended_ms; /* negotiate extended master secret? */
char etm; ; /* negotiate encrypt then mac? ? */
char etm; /* negotiate encrypt then mac? ? */
} opt;
static void my_debug( void *ctx, int level, const char *str )