Suyu/mbedtls
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/mbedtls.git synced 2025-12-30 03:06:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'mbedtls-1.3' into development

Browse source 
* mbedtls-1.3:
  Fix typos in Changelog
  Fix macro name from wrong branch
  Fix bug in pk_parse_key()
  Fixed typos
  Updated Travis CI config for mbedtls project

Conflicts:
	include/mbedtls/ecp.h
	include/polarssl/compat-1.2.h
	include/polarssl/openssl.h
	include/polarssl/platform.h
	library/pkparse.c
	programs/pkey/mpi_demo.c
This commit is contained in:
Manuel Pégourié-Gonnard 2015-04-15 11:30:46 +02:00
commit 862d503c01
8 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
programs/pkey/mpi_demo.c
View file

@ -96,7 +96,7 @@ cleanup:
if( ret != 0 )
{
mbedtls_printf( "\nAn error occured.\n" );
polarssl_printf( "\nAn error occurred.\n" );
ret = 1;
}