commit 5fd4917d97e45d7524312ad2150facd2c1fdba36
author Paul Bakker <p.j.bakker@polarssl.org> Mon Aug 19 13:29:26 2013 +0200
committer Paul Bakker <p.j.bakker@polarssl.org> Mon Aug 19 13:30:28 2013 +0200
tree 92fa71096dd90bf4edd6492e9760a976705f36e5
parent 59da0a46a43256f240c65917d05eeb3cbb727862

Add missing ifdefs in ssl modules

library/ssl_srv.c

diff --git a/library/ssl_srv.c b/library/ssl_srv.c
index 4bf68ae..36c4f2f 100644
--- a/library/ssl_srv.c
+++ b/library/ssl_srv.c
@@ -1289,9 +1289,11 @@
                     ciphersuite_info->max_minor_ver < ssl->minor_ver )
                     continue;
 
+#if defined(POLARSSL_ECDH_C) || defined(POLARSSL_ECDSA_C)
                 if( ( ciphersuite_info->flags & POLARSSL_CIPHERSUITE_EC ) &&
                     ssl->handshake->ec_curve == 0 )
                     continue;
+#endif
 
                 goto have_ciphersuite;
             }

library/ssl_tls.c

diff --git a/library/ssl_tls.c b/library/ssl_tls.c
index 039b536..e2bc3da 100644
--- a/library/ssl_tls.c
+++ b/library/ssl_tls.c
@@ -1011,6 +1011,7 @@
 
         switch( ssl->transform_out->ciphersuite_info->cipher )
         {
+#if defined(POLARSSL_DES_C)
             case POLARSSL_CIPHER_DES_CBC:
                 des_crypt_cbc( (des_context *) ssl->transform_out->ctx_enc,
                                DES_ENCRYPT, enc_msglen,
@@ -1022,20 +1023,25 @@
                                DES_ENCRYPT, enc_msglen,
                                ssl->transform_out->iv_enc, enc_msg, enc_msg );
                 break;
+#endif
 
+#if defined(POLARSSL_AES_C)
             case POLARSSL_CIPHER_AES_128_CBC:
             case POLARSSL_CIPHER_AES_256_CBC:
                 aes_crypt_cbc( (aes_context *) ssl->transform_out->ctx_enc,
                                AES_ENCRYPT, enc_msglen,
                                ssl->transform_out->iv_enc, enc_msg, enc_msg );
                 break;
+#endif
 
+#if defined(POLARSSL_CAMELLIA_C)
             case POLARSSL_CIPHER_CAMELLIA_128_CBC:
             case POLARSSL_CIPHER_CAMELLIA_256_CBC:
                 camellia_crypt_cbc( (camellia_context *) ssl->transform_out->ctx_enc,
                                     CAMELLIA_ENCRYPT, enc_msglen,
                                     ssl->transform_out->iv_enc, enc_msg, enc_msg );
                 break;
+#endif
 
             default:
                 return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );
@@ -1188,6 +1194,7 @@
 
         switch( ssl->transform_in->ciphersuite_info->cipher )
         {
+#if defined(POLARSSL_DES_C)
             case POLARSSL_CIPHER_DES_CBC:
                 des_crypt_cbc( (des_context *) ssl->transform_in->ctx_dec,
                                DES_DECRYPT, dec_msglen,
@@ -1199,20 +1206,25 @@
                                DES_DECRYPT, dec_msglen,
                                ssl->transform_in->iv_dec, dec_msg, dec_msg_result );
                 break;
+#endif
 
+#if defined(POLARSSL_AES_C)
             case POLARSSL_CIPHER_AES_128_CBC:
             case POLARSSL_CIPHER_AES_256_CBC:
                 aes_crypt_cbc( (aes_context *) ssl->transform_in->ctx_dec,
                                AES_DECRYPT, dec_msglen,
                                ssl->transform_in->iv_dec, dec_msg, dec_msg_result );
                 break;
+#endif
 
+#if defined(POLARSSL_CAMELLIA_C)
             case POLARSSL_CIPHER_CAMELLIA_128_CBC:
             case POLARSSL_CIPHER_CAMELLIA_256_CBC:
                 camellia_crypt_cbc( (camellia_context *) ssl->transform_in->ctx_dec,
                                     CAMELLIA_DECRYPT, dec_msglen,
                                     ssl->transform_in->iv_dec, dec_msg, dec_msg_result );
                 break;
+#endif
 
             default:
                 return( POLARSSL_ERR_SSL_FEATURE_UNAVAILABLE );