Fix mismatched macro guard between c and header file #157
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Summary: The following functions are under different macro guard between [c file](https://github.com/hannestschofenig/mbedtls/blob/tls13-prototype/library/ssl_tls.c#L5937) and [header file](https://github.com/hannestschofenig/mbedtls/blob/tls13-prototype/include/mbedtls/ssl.h#L2950-L2951) * mbedtls_ssl_set_session * mbedtls_ssl_session_save * mbedtls_ssl_session_load * mbedtls_ssl_get_session_pointer [https://github.com/hannestschofenig/mbedtls/blob/tls13-prototype/programs/ssl/ssl_client2.c#L3488](https://github.com/hannestschofenig/mbedtls/blob/tls13-prototype/programs/ssl/ssl_client2.c#L3488) is used in client, so the [MBEDTLS_SSL_SRV_C](https://github.com/hannestschofenig/mbedtls/blob/tls13-prototype/library/ssl_tls.c#L5937) macro in C file seems incorrect. Change the macro in c file to match the header file. Also move `ssl_serialized_session_header` [inside](https://github.com/hannestschofenig/mbedtls/blob/tls13-prototype/library/ssl_tls.c#L5937) as it is only used in the block, and don't need different macro guard Test Plan: Undefine MBEDTLS_SSL_SRV_C, and make ``` git diff diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 80a632613..1a4370ef5 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -3386,7 +3386,7 @@ * * This module is required for SSL/TLS server support. */ -#define MBEDTLS_SSL_SRV_C +//#define MBEDTLS_SSL_SRV_C /** * \def MBEDTLS_SSL_TLS_C ``` The following compiler error should be fixed. ``` /home/lhuang04/upstream/library/ssl_tls.c:5928:22: error: ‘ssl_serialized_session_header’ defined but not used [-Werror=unused-variable] static unsigned char ssl_serialized_session_header[] = { ^ cc1: all warnings being treated as errors make[2]: *** [library/CMakeFiles/mbedtls.dir/ssl_tls.c.o] Error 1 make[2]: *** Waiting for unfinished jobs.... [ 34%] Built target cert_write make[1]: *** [library/CMakeFiles/mbedtls.dir/all] Error 2 make: *** [all] Error 2 ``` Reviewers: Subscribers: Tasks: Tags:
|
I looked at this PR and tested it. Once it is merged I would like to add a small addition to allow compilation of the code without any ticket handling support. In any case, I prefer this to get merged soon. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary:
The following functions are under different macro guard between c file and header file
https://github.com/hannestschofenig/mbedtls/blob/tls13-prototype/programs/ssl/ssl_client2.c#L3488
is used in client, so the
MBEDTLS_SSL_SRV_C macro in C file seems incorrect.
Change the macro in c file to match the header file.
Also move
ssl_serialized_session_headerinside as it is only used inthe block, and don't need different macro guard
Test Plan:
Undefine MBEDTLS_SSL_SRV_C, and make
The following compiler error should be fixed.
Reviewers:
Subscribers:
Tasks:
Tags: