Conversation
We were using CPUID coded in several modules, but it was unclear how it actually got there, and could fail randomly. To remedy that, this change separates the CPUID C code from the rest of cryptlib.c, and ensures the right modules get both that and the assembler sources explicitly. Fixes openssl#11281
It turns out that some CPUID code requires the presence of some BN assembler code, so we make sure it's included in the same manner as the CPUID code itself.
levitte
added
branch: master
|
For testing purposes, I've a merge of this and #14753 in https://github.com/levitte/openssl/tree/fix-11281%2B%2Bworkflow-reimplement-no-shared |
|
Judging from the current build status for https://github.com/levitte/openssl/tree/fix-11281%2B%2Bworkflow-reimplement-no-shared (which now also includes @slontis' #14738), this PR is good to go now. |
|
The external-tests failure currently visible doesn't look relevant... |
crypto/cpuid.c
Outdated
| @@ -0,0 +1,215 @@ | |||
| /* | |||
| * Copyright 1998-2020 The OpenSSL Project Authors. All Rights Reserved. | |||
There was a problem hiding this comment.
Not sure why you went backwards with the date here :)
There was a problem hiding this comment.
I didn't... I originally did this stuff last year, and didn't think to look now.
There was a problem hiding this comment.
I would argue that you added this file just yesterday (1998-2021)
There was a problem hiding this comment.
I would argue that you added this file just yesterday (1998-2021)
Then you would be wrong.
commit c1c52b5
Author: Richard Levitte [email protected]
Date: Wed Mar 11 17:38:46 2020 +0100
t8m
added
approval: done
|
24 hours has passed since 'approval: done' was set, but this PR has failing CI tests. Once the tests pass it will get moved to 'approval: ready to merge' automatically, alternatively please review and set the label manually. |
We were using CPUID coded in several modules, but it was unclear how it actually got there, and could fail randomly. To remedy that, this change separates the CPUID C code from the rest of cryptlib.c, and ensures the right modules get both that and the assembler sources explicitly. Fixes #11281 Reviewed-by: Tomas Mraz <[email protected]> (Merged from #14755)
It turns out that some CPUID code requires the presence of some BN assembler code, so we make sure it's included in the same manner as the CPUID code itself. Reviewed-by: Tomas Mraz <[email protected]> (Merged from #14755)
4 participants
We were using CPUID coded in several modules, but it was unclear how
it actually got there, and could fail randomly.
To remedy that, this change separates the CPUID C code from the rest
of cryptlib.c, and ensures the right modules get both that and the
assembler sources explicitly.
Fixes #11281