Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Net app API #540

Merged
merged 8 commits into from
Jun 30, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ext/lib/crypto/mbedtls/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ config MBEDTLS_CFG_FILE
help
Enable custom mbed TLS configuration

config MBEDTLS_DEBUG
string "mbed TLS debug activation"
depends on MBEDTLS_BUILTIN
default n
help
Enable debugging activation for mbed TLS configuration. Note that this
does not directly cause any debug print output. For that you need to
call
mbedtls_debug_set_threshold(level);
and
mbedtls_ssl_conf_dbg(&mbedtls.conf, my_debug, NULL);
functions in your application, and create the my_debug() function to
actually print something useful.

config MBEDTLS_TEST
bool "Compile internal self test functions"
depends on MBEDTLS_BUILTIN
Expand Down
34 changes: 12 additions & 22 deletions ext/lib/crypto/mbedtls/configs/config-mini-tls1_2.h
Original file line number Diff line number Diff line change
@@ -1,26 +1,11 @@
/*
* Minimal configuration for TLS 1.1 (RFC 4346)
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
* Copyright (c) 2017 Intel Corporation.
*
* Copyright (C) 2006-2015, ARM Limited, All Rights Reserved
* SPDX-License-Identifier: Apache-2.0
* 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
* Minimal configuration for TLS 1.1 (RFC 4346) for Zephyr, implementing only
* the required ciphersuite: MBEDTLS_TLS_RSA_WITH_3DES_EDE_CBC_SHA
*
* See README.txt for usage instructions.
*/
Expand Down Expand Up @@ -81,10 +66,15 @@
/* For test certificates */
#define MBEDTLS_BASE64_C
#define MBEDTLS_CERTS_C
#define MBEDTLS_PEM_PARSE_C

#if defined(CONFIG_MBEDTLS_DEBUG)
#define MBEDTLS_ERROR_C
#define MBEDTLS_DEBUG_C
#define MBEDTLS_SSL_DEBUG_ALL
#define MBEDTLS_SSL_ALL_ALERT_MESSAGES
#endif

#define MBEDTLS_SSL_MAX_CONTENT_LEN 1024
#define MBEDTLS_SSL_MAX_CONTENT_LEN 1500

#include "mbedtls/check_config.h"

Expand Down
Loading