Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-07-31 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4207 from misch7/fix-v2.7-issue-4206

Browse Source 
Fix build of 2.7 with MBEDTLS_CERTS_C disabled in config (fixes #4206)
This commit is contained in:
Dave Rodgman
2021-03-08 15:16:45 +00:00
committed by GitHub
parent 6a6668a944 b3961a0142
commit 99f4f13c0f
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog.d/build-without-certs.txt
+3
View File
@@ -0,0 +1,3 @@
Bugfix
* Fix the build of sample programs when MBEDTLS_PEM_C is enabled but
MBEDTLS_CERTS_C is disabled. Reported by Michael Schuster in #4206.
programs/ssl/ssl_client2.c
+3 -3
View File
@@ -1145,8 +1145,8 @@ int main( int argc, char *argv[] )
mbedtls_printf( "MBEDTLS_CERTS_C not defined." );
#else
mbedtls_printf( "All test CRTs loaded via MBEDTLS_CERTS_C are PEM-encoded, but MBEDTLS_PEM_PARSE_C is disabled." );
}
#endif /* MBEDTLS_CERTS_C */
}
#endif /* MBEDTLS_CERTS_C && MBEDTLS_PEM_PARSE_C */
if( ret < 0 )
{
@@ -1182,8 +1182,8 @@ int main( int argc, char *argv[] )
mbedtls_printf( "MBEDTLS_CERTS_C not defined." );
#else
mbedtls_printf( "All test CRTs loaded via MBEDTLS_CERTS_C are PEM-encoded, but MBEDTLS_PEM_PARSE_C is disabled." );
}
#endif /* MBEDTLS_CERTS_C */
}
#endif /* MBEDTLS_CERTS_C && MBEDTLS_PEM_PARSE_C */
if( ret != 0 )
{
@@ -1209,8 +1209,8 @@ int main( int argc, char *argv[] )
mbedtls_printf( "MBEDTLS_CERTS_C not defined." );
#else
mbedtls_printf( "All test keys loaded via MBEDTLS_CERTS_C are PEM-encoded, but MBEDTLS_PEM_PARSE_C is disabled." );
}
#endif /* MBEDTLS_CERTS_C */
}
#endif /* MBEDTLS_CERTS_C && MBEDTLS_PEM_PARSE_C */
if( ret != 0 )
{
programs/ssl/ssl_server2.c
+1 -1
View File
@@ -1658,8 +1658,8 @@ int main( int argc, char *argv[] )
mbedtls_printf( "MBEDTLS_CERTS_C not defined." );
#else
mbedtls_printf( "All test CRTs loaded via MBEDTLS_CERTS_C are PEM-encoded, but MBEDTLS_PEM_PARSE_C is disabled." );
}
#endif /* MBEDTLS_CERTS_C */
}
#endif /* MBEDTLS_CERTS_C && MBEDTLS_PEM_PARSE_C */
if( ret < 0 )
{