From 3a306b90673ccd5f057827ae76113eaf290e1e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Tue, 29 Apr 2014 15:11:17 +0200 Subject: [PATCH] Fix misplaced #endif in ssl_tls.c --- ChangeLog | 1 + library/ssl_tls.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 033f30da3..ea98c8737 100644 --- a/ChangeLog +++ b/ChangeLog @@ -19,6 +19,7 @@ Bugfix * Fix false reject in padding check in ssl_decrypt_buf() for CBC ciphersuites, for full SSL frames of data. * Fix dependencies issues in X.509 test suite. + * Some parts of ssl_tls.c were compiled even when the module was disabled. = PolarSSL 1.3.6 released on 2014-04-11 diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 271bfe605..cbbbd5bd7 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -4753,8 +4753,6 @@ md_type_t ssl_md_alg_from_hash( unsigned char hash ) } } -#endif - #if defined(POLARSSL_SSL_SET_CURVES) /* * Check is a curve proposed by the peer is in our list. @@ -4852,3 +4850,5 @@ int ssl_check_cert_usage( const x509_crt *cert, return( 0 ); } #endif /* POLARSSL_X509_CRT_PARSE_C */ + +#endif /* POLARSSL_SSL_TLS_C */