Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add an NV_SEED test to the config adjustment script #6509

Merged
merged 2 commits into from Apr 10, 2018
Merged

Add an NV_SEED test to the config adjustment script #6509

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
717573f
Add an NV_SEED test to the config adjustment script
Mar 29, 2018
ebb28b3
Move the new check into the end of the previous line
Mar 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion features/mbedtls/importer/adjust-config.sh
View file
Open in desktop
Expand Up @@ -66,7 +66,8 @@ add_code
"#endif\n" \
"\n" \
"#if defined(MBEDTLS_SSL_TLS_C) && !defined(MBEDTLS_TEST_NULL_ENTROPY) && \\\\\n" \
" !defined(MBEDTLS_ENTROPY_HARDWARE_ALT)\n" \
" !defined(MBEDTLS_ENTROPY_HARDWARE_ALT) && \\\\\n" \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't need so many backslashes here, do we?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without them we barely make it at the line being 79 characters wide. I will change this.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Four \\\\s are to retain one \ used as line continuation escape character in multi line macro.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's understood, but we didn't have them before. I'm happy with the currently proposed change.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They were introduced because we were extending the macro with another line.
Now the change is made in the same line. Hence not needed.

" !defined(MBEDTLS_ENTROPY_NV_SEED)\n" \
"#error \"No entropy source was found at build time, so TLS \" \\\\\n" \
" \"functionality is not available\"\n" \
"#endif\n"
Expand Down