1
0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-07-28 00:21:48 +03:00

Merge branch 'development' into dtls

* 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
261 changed files with 486 additions and 3625 deletions

View File

@ -2,9 +2,9 @@
* SSL server demonstration program using pthread for handling multiple
* clients.
*
* Copyright (C) 2006-2013, Brainspark B.V.
* Copyright (C) 2006-2013, 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.
@ -77,7 +77,7 @@ int main( int argc, char *argv[] )
#define HTTP_RESPONSE \
"HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \
"<h2>PolarSSL Test Server</h2>\r\n" \
"<h2>mbed TLS Test Server</h2>\r\n" \
"<p>Successful connection using: %s</p>\r\n"
#define DEBUG_LEVEL 0