lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-12-06 12:00:59 +03:00
Code Activity

Merge branch 'development' into dtls

Browse Source 
* development:
  Update copyright
  Fix issue in compat.sh
  Rename doxyfile
  Rename to mbed TLS in tests/
  Rename to mbed TLS in examples
  Remove old test certificates.
  Rename to mbed TLS in the documentation/comments
  Change name to mbed TLS in the copyright notice

Conflicts:
	doxygen/input/doc_mainpage.h
	doxygen/mbedtls.doxyfile
	include/polarssl/version.h
	tests/compat.sh
This commit is contained in:
Manuel Pégourié-Gonnard
2015-01-23 10:23:17 +00:00
parent 3bb0801a95 a658a4051b
commit eab72e2ced
261 changed files with 486 additions and 3625 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/polarssl/ssl.h
View File

@@ -3,9 +3,9 @@
*
* \brief SSL/TLS functions.
*
* Copyright (C) 2006-2014, Brainspark B.V.
* Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
* This file is part of PolarSSL (http://www.polarssl.org)
* This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -1480,8 +1480,8 @@ int ssl_set_session( ssl_context *ssl, const ssl_session *session );
* order. First in the list has the highest preference.
* (Overrides all version specific lists)
*
* Note: The PolarSSL SSL server uses its own preferences
* over the preference of the connection SSL client unless
* Note: The server uses its own preferences
* over the preference of the client unless
* POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE is defined!
*
* \param ssl SSL context
@@ -1564,7 +1564,7 @@ int ssl_set_own_cert_rsa( ssl_context *ssl, x509_crt *own_cert,
#endif /* POLARSSL_RSA_C */
/**
* \brief Set own certificate and alternate non-PolarSSL RSA private
* \brief Set own certificate and external RSA private
* key and handling callbacks, such as the PKCS#11 wrappers
* or any other external private key handler.
* (see the respective RSA functions in rsa.h for documentation