yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-29 14:44:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into IOTSSL-442-hello-noext

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
Simon Butcher 2015-07-27 13:45:40 +01:00
commit 10a6f02f83
4 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -8,6 +8,11 @@ Bugfix
Leisink). Leisink).
* Fix bug when parsing a ServerHello without extensions (found by David * Fix bug when parsing a ServerHello without extensions (found by David
Sears). Sears).
* Fix bug in CMake lists that caused libmbedcrypto.a not to be installed
(found by Benoit Lecocq).
* Fix bug in Makefile that caused libmbedcrypto and libmbedx509 not to be
installed (found by Rawi666).
= mbed TLS 2.0.0 released 2015-07-13 = mbed TLS 2.0.0 released 2015-07-13

6
Makefile
View File

@ -25,7 +25,9 @@ install: all
cp -r include/mbedtls $(DESTDIR)/include cp -r include/mbedtls $(DESTDIR)/include
mkdir -p $(DESTDIR)/lib mkdir -p $(DESTDIR)/lib
cp -RP library/libmbedtls.* $(DESTDIR)/lib cp -RP library/libmbedtls.* $(DESTDIR)/lib
cp -RP library/libmbedx509.* $(DESTDIR)/lib
cp -RP library/libmbedcrypto.* $(DESTDIR)/lib
mkdir -p $(DESTDIR)/bin mkdir -p $(DESTDIR)/bin
for p in programs/*/* ; do \ for p in programs/*/* ; do \
@ -40,6 +42,8 @@ install: all
uninstall: uninstall:
rm -rf $(DESTDIR)/include/mbedtls rm -rf $(DESTDIR)/include/mbedtls
rm -f $(DESTDIR)/lib/libmbedtls.* rm -f $(DESTDIR)/lib/libmbedtls.*
rm -f $(DESTDIR)/lib/libmbedx509.*
rm -f $(DESTDIR)/lib/libmbedcrypto.*
for p in programs/*/* ; do \ for p in programs/*/* ; do \
if [ -x $$p ] && [ ! -d $$p ] ; \ if [ -x $$p ] && [ ! -d $$p ] ; \

3
README.rst
View File

@ -150,7 +150,8 @@ Process
`start a discussion <https://tls.mbed.org/discussions>`_ around a feature `start a discussion <https://tls.mbed.org/discussions>`_ around a feature
idea or a bug. idea or a bug.
#. Fork the `mbed TLS repository on Github <https://github.com/ARMmbed/mbedtls>`_ #. Fork the `mbed TLS repository on Github <https://github.com/ARMmbed/mbedtls>`_
to start making your changes. to start making your changes. As a general rule, you should use the
"development" branch as a basis.
#. Write a test which shows that the bug was fixed or that the feature works #. Write a test which shows that the bug was fixed or that the feature works
as expected. as expected.
#. Send a pull request and bug us until it gets merged and published. We will #. Send a pull request and bug us until it gets merged and published. We will

2
library/CMakeLists.txt
View File

@ -131,7 +131,7 @@ if(USE_STATIC_MBEDTLS_LIBRARY)
set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls) set_target_properties(${mbedtls_static_target} PROPERTIES OUTPUT_NAME mbedtls)
target_link_libraries(${mbedtls_static_target} ${libs} ${mbedx509_static_target}) target_link_libraries(${mbedtls_static_target} ${libs} ${mbedx509_static_target})
install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} ${mbedcrypt_static_target} install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} ${mbedcrypto_static_target}
DESTINATION ${LIB_INSTALL_DIR} DESTINATION ${LIB_INSTALL_DIR}
PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
endif(USE_STATIC_MBEDTLS_LIBRARY) endif(USE_STATIC_MBEDTLS_LIBRARY)