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.

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

mbedtls: Rename Mbed timing implementation #14760

Merged
merged 1 commit into from
Jun 11, 2021

Conversation

Patater
Copy link
Contributor

@Patater Patater commented Jun 10, 2021

Summary of changes

We get a linker warning with the recently added timing module
implementation for Mbed. This is because there is Mbed TLS also ships a
file called timing.c, which we are including in Mbed OS also. With CLI
1, we get an error about unique object files because of the similarly
named implementation files.

Object file timing.o is not unique! It could be made from: mbed-os/connectivity/mbedtls/source/timing.c mbed-os/connectivity/mbedtls/platform/src/timing.cpp

Rename the Mbed timing module implementation to timing_alt.cpp to avoid
this naming conflict.

Fixes: b8781e5 ("mbedtls: Add an alt implementation of timing")

Fixes #14759

Impact of changes

None

Migration actions required

None

Documentation

None


Pull request type

[X] Patch update (Bug fix / Target update / Docs update / Test update / Refactor)
[] Feature update (New feature / Functionality change / New API)
[] Major update (Breaking change E.g. Return code change / API behaviour change)

Test results

[] No Tests required for this change (E.g docs only update)
[X] Covered by existing mbed-os tests (Greentea or Unittest)
[] Tests / results supplied as part of this PR

Reviewers


@ciarmcom ciarmcom added the release-type: patch Indentifies a PR as containing just a patch label Jun 10, 2021
@ciarmcom ciarmcom requested a review from a team June 10, 2021 15:00
@ciarmcom
Copy link
Member

@Patater, thank you for your changes.
@ARMmbed/mbed-os-maintainers please review.

We get a linker warning with the recently added timing module
implementation for Mbed. This is because there is Mbed TLS also ships a
file called timing.c, which we are including in Mbed OS also. With CLI
1, we get an error about unique object files because of the similarly
named implementation files.

    Object file timing.o is not unique! It could be made from: mbed-os/connectivity/mbedtls/source/timing.c mbed-os/connectivity/mbedtls/platform/src/timing.cpp

Rename the Mbed timing module implementation to timing_mbed.cpp to avoid
this naming conflict.

Fixes: b8781e5 ("mbedtls: Add an alt implementation of timing")

Fixes ARMmbed#14759
@Patater Patater force-pushed the tls-timing-alt-fix branch from 286adb2 to 87d1992 Compare June 10, 2021 16:02
@Patater Patater requested a review from rwalton-arm June 10, 2021 16:03
@Patater
Copy link
Contributor Author

Patater commented Jun 10, 2021

CI started

@mbed-ci
Copy link

mbed-ci commented Jun 10, 2021

Jenkins CI Test : ✔️ SUCCESS

Build Number: 1 | 🔒 Jenkins CI Job | 🌐 Logs & Artifacts

CLICK for Detailed Summary

jobs Status
jenkins-ci/mbed-os-ci_unittests ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-cloud-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-cloud-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-ARM ✔️
jenkins-ci/mbed-os-ci_cmake-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-greentea-GCC_ARM ✔️
jenkins-ci/mbed-os-ci_build-example-ARM ✔️
jenkins-ci/mbed-os-ci_greentea-test ✔️

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 10, 2021

I marked this as ready for CI, waiting for Travis to be restored

@0xc0170
Copy link
Contributor

0xc0170 commented Jun 11, 2021

I'll reopen in 2-3 minutes, that should restart Travis

@mergify mergify bot removed component: security needs: CI release-type: patch Indentifies a PR as containing just a patch labels Jun 11, 2021
@0xc0170 0xc0170 reopened this Jun 11, 2021
@0xc0170 0xc0170 added component: security needs: CI release-type: patch Indentifies a PR as containing just a patch labels Jun 11, 2021
@0xc0170 0xc0170 merged commit 86b85a3 into ARMmbed:master Jun 11, 2021
@mergify mergify bot removed the ready for merge label Jun 11, 2021
@mbedmain mbedmain added release-version: 6.12.0 Release-pending and removed release-type: patch Indentifies a PR as containing just a patch Release-pending labels Jun 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

new mbedtls/timing.cpp creates double timing.o module
6 participants