Skip to content

Rename *ring* internals to avoid conflicts with OpenSSL.#280

Closed
briansmith wants to merge 12 commits intorustfmtfrom
rename_gfp
Closed

Rename *ring* internals to avoid conflicts with OpenSSL.#280
briansmith wants to merge 12 commits intorustfmtfrom
rename_gfp

Conversation

@briansmith
Copy link
Copy Markdown
Owner

This series of commits will rename every single extern C symbol in ring so that each one has a different name from any OpenSSL function. This should allow ring and rust-openssl to be linked together into the same program.

@briansmith
Copy link
Copy Markdown
Owner Author

Just to clarify: This is a WIP. It isn't done yet. I'll keep updating the PR as I make progress.

@briansmith briansmith changed the base branch from master to rustfmt August 28, 2016 00:41
@briansmith briansmith force-pushed the rename_gfp branch 6 times, most recently from feabbc0 to 13a87c6 Compare August 29, 2016 01:37
@briansmith
Copy link
Copy Markdown
Owner Author

Landed in master as:

fcbf905 Use the GFp_ prefix for nistz384 externs.
c378a2e Use the GFp_ prefix for nistz256 externs.
dd0865a Use the GFp_ prefix for digest externs.
02602de Use the "GFp_" prefix C integer type metrics & simplify them.
e6b9b97 Use the "GFp_" prefix for Curve25519 functions.
7900e98 Use the "GFp_" prefix for RSA externs.
5ec28f5 Use the "GFp_" prefix for ChaCha20 externs.
05f2c83 Use the "GFp_" prefix for poly1305 functions.
5eb9ac9 Use the "GFp_" prefix for CPU capabilities externs.
e95806f Use the "GFp_" prefix for BIGNUM externs.
6c8a344 Use the "GFp_" prefix for AES externs.

@frewsxcv
Copy link
Copy Markdown
Contributor

Can this be closed?

@briansmith
Copy link
Copy Markdown
Owner Author

I'm going to leave this open because (a) I didn't verify it is correct on every target, especially no-asm, ARM32, AAarch64, and (b) I want to add something to the build/test automation to ensure there are no regressions in this.

@briansmith
Copy link
Copy Markdown
Owner Author

I'm going to leave this open because (a) I didn't verify it is correct on every target, especially no-asm, ARM32, AAarch64, and (b) I want to add something to the build/test automation to ensure there are no regressions in this.

The remaining work is now tracked in #297.

@briansmith briansmith closed this Sep 10, 2016
@briansmith briansmith deleted the rename_gfp branch September 10, 2016 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants