mirror of
				https://github.com/cuberite/polarssl.git
				synced 2025-11-04 04:32:24 -05:00 
			
		
		
		
	Revert "Remove irrelevant configs"
This reverts commit 1ad37309e4f17d73c2f22c3ff4bffe2523abe17c.
Conflicts:
* tests/scripts/test-ref-configs.pl:
    * config-ccm-psk-tls1_2.h: there has been an addition of
      "config-symmetric-only.h" at the place where the configurations
      that are added back were removed. Keep this configuration.
			
			
This commit is contained in:
		
							parent
							
								
									9d28c426d1
								
							
						
					
					
						commit
						12230eb5c8
					
				
							
								
								
									
										88
									
								
								configs/config-ccm-psk-tls1_2.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										88
									
								
								configs/config-ccm-psk-tls1_2.h
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,88 @@
 | 
				
			|||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * \file config-ccm-psk-tls1_2.h
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * \brief Minimal configuration for TLS 1.2 with PSK and AES-CCM ciphersuites
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
 | 
				
			||||||
 | 
					 *  SPDX-License-Identifier: Apache-2.0
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  Licensed under the Apache License, Version 2.0 (the "License"); you may
 | 
				
			||||||
 | 
					 *  not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					 *  You may obtain a copy of the License at
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  http://www.apache.org/licenses/LICENSE-2.0
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  Unless required by applicable law or agreed to in writing, software
 | 
				
			||||||
 | 
					 *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 | 
				
			||||||
 | 
					 *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
				
			||||||
 | 
					 *  See the License for the specific language governing permissions and
 | 
				
			||||||
 | 
					 *  limitations under the License.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  This file is part of mbed TLS (https://tls.mbed.org)
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * Minimal configuration for TLS 1.2 with PSK and AES-CCM ciphersuites
 | 
				
			||||||
 | 
					 * Distinguishing features:
 | 
				
			||||||
 | 
					 * - no bignum, no PK, no X509
 | 
				
			||||||
 | 
					 * - fully modern and secure (provided the pre-shared keys have high entropy)
 | 
				
			||||||
 | 
					 * - very low record overhead with CCM-8
 | 
				
			||||||
 | 
					 * - optimized for low RAM usage
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * See README.txt for usage instructions.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					#ifndef MBEDTLS_CONFIG_H
 | 
				
			||||||
 | 
					#define MBEDTLS_CONFIG_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* System support */
 | 
				
			||||||
 | 
					//#define MBEDTLS_HAVE_TIME /* Optionally used in Hello messages */
 | 
				
			||||||
 | 
					/* Other MBEDTLS_HAVE_XXX flags irrelevant for this configuration */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* mbed TLS feature support */
 | 
				
			||||||
 | 
					#define MBEDTLS_KEY_EXCHANGE_PSK_ENABLED
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_PROTO_TLS1_2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* mbed TLS modules */
 | 
				
			||||||
 | 
					#define MBEDTLS_AES_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CCM_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CIPHER_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CTR_DRBG_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ENTROPY_C
 | 
				
			||||||
 | 
					#define MBEDTLS_MD_C
 | 
				
			||||||
 | 
					#define MBEDTLS_NET_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SHA256_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_CLI_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_SRV_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_TLS_C
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Save RAM at the expense of ROM */
 | 
				
			||||||
 | 
					#define MBEDTLS_AES_ROM_TABLES
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Save some RAM by adjusting to your exact needs */
 | 
				
			||||||
 | 
					#define MBEDTLS_PSK_MAX_LEN    16 /* 128-bits keys are generally enough */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * You should adjust this to the exact number of sources you're using: default
 | 
				
			||||||
 | 
					 * is the "platform_entropy_poll" source, but you may want to add other ones
 | 
				
			||||||
 | 
					 * Minimum is 2 for the entropy test suite.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					#define MBEDTLS_ENTROPY_MAX_SOURCES 2
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * Use only CCM_8 ciphersuites, and
 | 
				
			||||||
 | 
					 * save ROM and a few bytes of RAM by specifying our own ciphersuite list
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_CIPHERSUITES                        \
 | 
				
			||||||
 | 
					        MBEDTLS_TLS_PSK_WITH_AES_256_CCM_8,             \
 | 
				
			||||||
 | 
					        MBEDTLS_TLS_PSK_WITH_AES_128_CCM_8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * Save RAM at the expense of interoperability: do this only if you control
 | 
				
			||||||
 | 
					 * both ends of the connection!  (See comments in "mbedtls/ssl.h".)
 | 
				
			||||||
 | 
					 * The optimal size here depends on the typical size of records.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_MAX_CONTENT_LEN             1024
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "mbedtls/check_config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif /* MBEDTLS_CONFIG_H */
 | 
				
			||||||
							
								
								
									
										3377
									
								
								configs/config-default.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3377
									
								
								configs/config-default.h
									
									
									
									
									
										Normal file
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
							
								
								
									
										75
									
								
								configs/config-mini-tls1_1.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										75
									
								
								configs/config-mini-tls1_1.h
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,75 @@
 | 
				
			|||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * \file config-mini-tls1_1.h
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * \brief Minimal configuration for TLS 1.1 (RFC 4346)
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
 | 
				
			||||||
 | 
					 *  SPDX-License-Identifier: Apache-2.0
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  Licensed under the Apache License, Version 2.0 (the "License"); you may
 | 
				
			||||||
 | 
					 *  not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					 *  You may obtain a copy of the License at
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  http://www.apache.org/licenses/LICENSE-2.0
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  Unless required by applicable law or agreed to in writing, software
 | 
				
			||||||
 | 
					 *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 | 
				
			||||||
 | 
					 *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
				
			||||||
 | 
					 *  See the License for the specific language governing permissions and
 | 
				
			||||||
 | 
					 *  limitations under the License.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  This file is part of mbed TLS (https://tls.mbed.org)
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * Minimal configuration for TLS 1.1 (RFC 4346), implementing only the
 | 
				
			||||||
 | 
					 * required ciphersuite: MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * See README.txt for usage instructions.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifndef MBEDTLS_CONFIG_H
 | 
				
			||||||
 | 
					#define MBEDTLS_CONFIG_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* System support */
 | 
				
			||||||
 | 
					#define MBEDTLS_HAVE_ASM
 | 
				
			||||||
 | 
					#define MBEDTLS_HAVE_TIME
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* mbed TLS feature support */
 | 
				
			||||||
 | 
					#define MBEDTLS_CIPHER_MODE_CBC
 | 
				
			||||||
 | 
					#define MBEDTLS_PKCS1_V15
 | 
				
			||||||
 | 
					#define MBEDTLS_KEY_EXCHANGE_RSA_ENABLED
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_PROTO_TLS1_1
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* mbed TLS modules */
 | 
				
			||||||
 | 
					#define MBEDTLS_AES_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ASN1_PARSE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ASN1_WRITE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_BIGNUM_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CIPHER_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CTR_DRBG_C
 | 
				
			||||||
 | 
					#define MBEDTLS_DES_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ENTROPY_C
 | 
				
			||||||
 | 
					#define MBEDTLS_MD_C
 | 
				
			||||||
 | 
					#define MBEDTLS_MD5_C
 | 
				
			||||||
 | 
					#define MBEDTLS_NET_C
 | 
				
			||||||
 | 
					#define MBEDTLS_OID_C
 | 
				
			||||||
 | 
					#define MBEDTLS_PK_C
 | 
				
			||||||
 | 
					#define MBEDTLS_PK_PARSE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_RSA_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SHA1_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SHA256_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_CLI_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_SRV_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_TLS_C
 | 
				
			||||||
 | 
					#define MBEDTLS_X509_CRT_PARSE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_X509_USE_C
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* For test certificates */
 | 
				
			||||||
 | 
					#define MBEDTLS_BASE64_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CERTS_C
 | 
				
			||||||
 | 
					#define MBEDTLS_PEM_PARSE_C
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "mbedtls/check_config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif /* MBEDTLS_CONFIG_H */
 | 
				
			||||||
							
								
								
									
										90
									
								
								configs/config-thread.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										90
									
								
								configs/config-thread.h
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,90 @@
 | 
				
			|||||||
 | 
					/**
 | 
				
			||||||
 | 
					 * \file config-thread.h
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * \brief Minimal configuration for using TLS as part of Thread
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 *  Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
 | 
				
			||||||
 | 
					 *  SPDX-License-Identifier: Apache-2.0
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  Licensed under the Apache License, Version 2.0 (the "License"); you may
 | 
				
			||||||
 | 
					 *  not use this file except in compliance with the License.
 | 
				
			||||||
 | 
					 *  You may obtain a copy of the License at
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  http://www.apache.org/licenses/LICENSE-2.0
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  Unless required by applicable law or agreed to in writing, software
 | 
				
			||||||
 | 
					 *  distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 | 
				
			||||||
 | 
					 *  WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 | 
				
			||||||
 | 
					 *  See the License for the specific language governing permissions and
 | 
				
			||||||
 | 
					 *  limitations under the License.
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 *  This file is part of mbed TLS (https://tls.mbed.org)
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/*
 | 
				
			||||||
 | 
					 * Minimal configuration for using TLS a part of Thread
 | 
				
			||||||
 | 
					 * http://threadgroup.org/
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * Distinguishing features:
 | 
				
			||||||
 | 
					 * - no RSA or classic DH, fully based on ECC
 | 
				
			||||||
 | 
					 * - no X.509
 | 
				
			||||||
 | 
					 * - support for experimental EC J-PAKE key exchange
 | 
				
			||||||
 | 
					 *
 | 
				
			||||||
 | 
					 * See README.txt for usage instructions.
 | 
				
			||||||
 | 
					 */
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#ifndef MBEDTLS_CONFIG_H
 | 
				
			||||||
 | 
					#define MBEDTLS_CONFIG_H
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* System support */
 | 
				
			||||||
 | 
					#define MBEDTLS_HAVE_ASM
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* mbed TLS feature support */
 | 
				
			||||||
 | 
					#define MBEDTLS_AES_ROM_TABLES
 | 
				
			||||||
 | 
					#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
 | 
				
			||||||
 | 
					#define MBEDTLS_ECP_NIST_OPTIM
 | 
				
			||||||
 | 
					#define MBEDTLS_KEY_EXCHANGE_ECJPAKE_ENABLED
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_MAX_FRAGMENT_LENGTH
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_PROTO_TLS1_2
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_PROTO_DTLS
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_EXPORT_KEYS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* mbed TLS modules */
 | 
				
			||||||
 | 
					#define MBEDTLS_AES_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ASN1_PARSE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ASN1_WRITE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_BIGNUM_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CCM_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CIPHER_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CTR_DRBG_C
 | 
				
			||||||
 | 
					#define MBEDTLS_CMAC_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ECJPAKE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ECP_C
 | 
				
			||||||
 | 
					#define MBEDTLS_ENTROPY_C
 | 
				
			||||||
 | 
					#define MBEDTLS_HMAC_DRBG_C
 | 
				
			||||||
 | 
					#define MBEDTLS_MD_C
 | 
				
			||||||
 | 
					#define MBEDTLS_OID_C
 | 
				
			||||||
 | 
					#define MBEDTLS_PK_C
 | 
				
			||||||
 | 
					#define MBEDTLS_PK_PARSE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SHA256_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_COOKIE_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_CLI_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_SRV_C
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_TLS_C
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Save RAM at the expense of ROM */
 | 
				
			||||||
 | 
					#define MBEDTLS_AES_ROM_TABLES
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Save RAM by adjusting to our exact needs */
 | 
				
			||||||
 | 
					#define MBEDTLS_ECP_MAX_BITS             256
 | 
				
			||||||
 | 
					#define MBEDTLS_MPI_MAX_SIZE              32 // 256 bits is 32 bytes
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					/* Save ROM and a few bytes of RAM by specifying our own ciphersuite list */
 | 
				
			||||||
 | 
					#define MBEDTLS_SSL_CIPHERSUITES MBEDTLS_TLS_ECJPAKE_WITH_AES_128_CCM_8
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#include "mbedtls/check_config.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					#endif /* MBEDTLS_CONFIG_H */
 | 
				
			||||||
@ -17,10 +17,18 @@ use warnings;
 | 
				
			|||||||
use strict;
 | 
					use strict;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
my %configs = (
 | 
					my %configs = (
 | 
				
			||||||
    'config-symmetric-only.h' => {
 | 
					    'config-default.h' => {
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    'config-mini-tls1_1.h' => {
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    'config-suite-b.h' => {
 | 
					    'config-suite-b.h' => {
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
 | 
					    'config-symmetric-only.h' => {
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    'config-ccm-psk-tls1_2.h' => {
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    'config-thread.h' => {
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
);
 | 
					);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# If no config-name is provided, use all known configs.
 | 
					# If no config-name is provided, use all known configs.
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user