From 9b6699066eaf355650b66c7b3a5f9c68a142125f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20P=C3=A9gouri=C3=A9-Gonnard?= Date: Fri, 6 Mar 2015 16:52:46 +0000 Subject: [PATCH] Fix typos in macro names --- include/polarssl/ccm.h | 2 +- include/polarssl/check_config.h | 4 ++-- include/polarssl/config.h | 6 +++--- include/polarssl/memory_buffer_alloc.h | 2 +- include/polarssl/ssl.h | 4 ++-- include/polarssl/threading.h | 2 +- include/polarssl/x509_crt.h | 2 +- library/ssl_tls.c | 2 +- library/threading.c | 2 +- library/version_features.c | 6 +++--- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/include/polarssl/ccm.h b/include/polarssl/ccm.h index f1f24bda0..070b39dec 100644 --- a/include/polarssl/ccm.h +++ b/include/polarssl/ccm.h @@ -128,4 +128,4 @@ int ccm_self_test( int verbose ); } #endif -#endif /* POLARSSL_CGM_H */ +#endif /* POLARSSL_CCM_H */ diff --git a/include/polarssl/check_config.h b/include/polarssl/check_config.h index a12c3028e..5369d88e7 100644 --- a/include/polarssl/check_config.h +++ b/include/polarssl/check_config.h @@ -103,7 +103,7 @@ #error "POLARSSL_HAVEGE_C defined, but not all prerequisites" #endif -#if defined(POLARSSL_HMAC_DRBG) && !defined(POLARSSL_MD_C) +#if defined(POLARSSL_HMAC_DRBG_C) && !defined(POLARSSL_MD_C) #error "POLARSSL_HMAC_DRBG_C defined, but not all prerequisites" #endif @@ -436,7 +436,7 @@ #if defined(POLARSSL_SSL_SESSION_TICKETS) && defined(POLARSSL_SSL_TLS_C) && \ ( !defined(POLARSSL_AES_C) || !defined(POLARSSL_SHA256_C) || \ !defined(POLARSSL_CIPHER_MODE_CBC) ) -#error "POLARSSL_SSL_SESSION_TICKETS_C defined, but not all prerequisites" +#error "POLARSSL_SSL_SESSION_TICKETS defined, but not all prerequisites" #endif #if defined(POLARSSL_SSL_CBC_RECORD_SPLITTING) && \ diff --git a/include/polarssl/config.h b/include/polarssl/config.h index 88670aa3a..14a9abbac 100644 --- a/include/polarssl/config.h +++ b/include/polarssl/config.h @@ -817,7 +817,7 @@ * * Enable sending of all alert messages */ -#define POLARSSL_SSL_ALERT_MESSAGES +#define POLARSSL_SSL_ALL_ALERT_MESSAGES /** * \def POLARSSL_SSL_DEBUG_ALL @@ -2255,7 +2255,7 @@ * * Module: library/x509_crt_write.c * - * Requires: POLARSSL_CREATE_C + * Requires: POLARSSL_X509_CREATE_C * * This module is required for X.509 certificate creation. */ @@ -2268,7 +2268,7 @@ * * Module: library/x509_csr_write.c * - * Requires: POLARSSL_CREATE_C + * Requires: POLARSSL_X509_CREATE_C * * This module is required for X.509 certificate request writing. */ diff --git a/include/polarssl/memory_buffer_alloc.h b/include/polarssl/memory_buffer_alloc.h index 19abe55fa..128c6f369 100644 --- a/include/polarssl/memory_buffer_alloc.h +++ b/include/polarssl/memory_buffer_alloc.h @@ -125,7 +125,7 @@ void memory_buffer_alloc_cur_get( size_t *cur_used, size_t *cur_blocks ); * and contain sane values. Helps debug buffer-overflow errors. * * Prints out first failure if POLARSSL_MEMORY_DEBUG is defined. - * Prints out full header information if POLARSSL_MEMORY_DEBUG_HEADERS + * Prints out full header information if POLARSSL_MEMORY_DEBUG * is defined. (Includes stack trace information for each block if * POLARSSL_MEMORY_BACKTRACE is defined as well). * diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h index dd1fbdc04..8c754ff14 100644 --- a/include/polarssl/ssl.h +++ b/include/polarssl/ssl.h @@ -328,7 +328,7 @@ #define SSL_COMPRESSION_ADD 0 #endif -#if defined(POLARSSL_RC4_C) || defined(POLARSSL_CIPHER_MODE_CBC) +#if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_MODE_CBC) /* Ciphersuites using HMAC */ #if defined(POLARSSL_SHA512_C) #define SSL_MAC_ADD 48 /* SHA-384 used for HMAC */ @@ -1389,7 +1389,7 @@ void ssl_set_dtls_anti_replay( ssl_context *ssl, char mode ); * many bogus packets. */ void ssl_set_dtls_badmac_limit( ssl_context *ssl, unsigned limit ); -#endif /* POLARSSL_DTLS_BADMAC_LIMIT */ +#endif /* POLARSSL_SSL_DTLS_BADMAC_LIMIT */ #if defined(POLARSSL_SSL_PROTO_DTLS) /** diff --git a/include/polarssl/threading.h b/include/polarssl/threading.h index 293da38c3..a60dc3d21 100644 --- a/include/polarssl/threading.h +++ b/include/polarssl/threading.h @@ -64,7 +64,7 @@ int threading_set_alt( int (*mutex_init)( threading_mutex_t * ), int (*mutex_free)( threading_mutex_t * ), int (*mutex_lock)( threading_mutex_t * ), int (*mutex_unlock)( threading_mutex_t * ) ); -#endif /* POLARSSL_THREADING_ALT_C */ +#endif /* POLARSSL_THREADING_ALT */ /* * The function pointers for mutex_init, mutex_free, mutex_ and mutex_unlock diff --git a/include/polarssl/x509_crt.h b/include/polarssl/x509_crt.h index fe270078f..fe1d97f65 100644 --- a/include/polarssl/x509_crt.h +++ b/include/polarssl/x509_crt.h @@ -174,7 +174,7 @@ int x509_crt_parse_file( x509_crt *chain, const char *path ); * correctly, the first error is returned. * * \warning This function is NOT thread-safe unless - * POLARSSL_THREADING_PTHREADS is defined. If you're using an + * POLARSSL_THREADING_PTHREAD is defined. If you're using an * alternative threading implementation, you should either use * this function only in the main thread, or mutex it. * diff --git a/library/ssl_tls.c b/library/ssl_tls.c index 2341f0598..5e9df52e0 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -3485,7 +3485,7 @@ read_record_header: #endif { /* Error out (and send alert) on invalid records */ -#if defined(POLARSSL_SSL_ALERT_MESSAGES) +#if defined(POLARSSL_SSL_ALL_ALERT_MESSAGES) if( ret == POLARSSL_ERR_SSL_INVALID_MAC ) { ssl_send_alert_message( ssl, diff --git a/library/threading.c b/library/threading.c index fa745afdb..5d48516ba 100644 --- a/library/threading.c +++ b/library/threading.c @@ -105,6 +105,6 @@ int threading_set_alt( int (*mutex_init)( threading_mutex_t * ), return( 0 ); } -#endif /* POLARSSL_THREADING_ALT_C */ +#endif /* POLARSSL_THREADING_ALT */ #endif /* POLARSSL_THREADING_C */ diff --git a/library/version_features.c b/library/version_features.c index b970ee1c0..fcda59575 100644 --- a/library/version_features.c +++ b/library/version_features.c @@ -279,9 +279,9 @@ static const char *features[] = { #if defined(POLARSSL_SSL_AEAD_RANDOM_IV) "POLARSSL_SSL_AEAD_RANDOM_IV", #endif /* POLARSSL_SSL_AEAD_RANDOM_IV */ -#if defined(POLARSSL_SSL_ALERT_MESSAGES) - "POLARSSL_SSL_ALERT_MESSAGES", -#endif /* POLARSSL_SSL_ALERT_MESSAGES */ +#if defined(POLARSSL_SSL_ALL_ALERT_MESSAGES) + "POLARSSL_SSL_ALL_ALERT_MESSAGES", +#endif /* POLARSSL_SSL_ALL_ALERT_MESSAGES */ #if defined(POLARSSL_SSL_DEBUG_ALL) "POLARSSL_SSL_DEBUG_ALL", #endif /* POLARSSL_SSL_DEBUG_ALL */