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

Jump to bottom

Provider common getters for ciphers and digest #9770

Closed
wants to merge 13 commits into from
Closed

Provider common getters for ciphers and digest #9770

wants to merge 13 commits into from

Conversation

paulidale
Copy link
Contributor

@paulidale paulidale commented Sep 5, 2019 •
edited

  • documentation is added or updated
  • tests are added or updated

Fixes #9768
Fixes #9794

@paulidale paulidale mentioned this pull request Sep 5, 2019
Closed
@paulidale paulidale marked this pull request as ready for review September 5, 2019 04:55
@paulidale
Copy link
Contributor Author

CMAC and GMAC went much faster than expected.

@paulidale paulidale added the branch: master Merge to master branch label Sep 5, 2019
@paulidale paulidale added this to In progress in 3.0 New Core + FIPS via automation Sep 5, 2019
levitte
levitte requested changes Sep 5, 2019
View changes
providers/common/include/internal/providercommon.h Outdated Show resolved Hide resolved
3.0 New Core + FIPS automation moved this from In progress to Needs review Sep 5, 2019
@levitte
Copy link
Member

levitte commented Sep 5, 2019

Ah, so this is what you meant. Cool!

I have just one concern that occurred to me just now... I think we may have a bit of symbol name leakage.

$ ar t libcrypto.a | grep ^prov

@paulidale
Copy link
Contributor Author

I'm not seeing the concerning output of the ar command.
I suspect I'm missing something obvious.

@paulidale
Copy link
Contributor Author

paulidale commented Sep 5, 2019 •
edited

Did you mean an nm of the .so?

These symbols are local, please ignore.

@paulidale
Copy link
Contributor Author

Ah, so this is what you meant. Cool!

Yeah, I didn't explain myself well as usual :(

@paulidale
Copy link
Contributor Author

paulidale commented Sep 5, 2019 •
edited

I still don't understand what is meant by the ar command.
I'm also sure that I'm missing something really obvious...

@levitte
Copy link
Member

levitte commented Sep 5, 2019 •
edited

I still don't understand what is meant by the ar command.

No wonder, I wrote that before coffee. This should make more sense:

$ nm -Pg libcrypto.a | grep ^prov

@paulidale
Copy link
Contributor Author

Okay, I admit that there is some leakage.
I'm not convinced that this change has caused it.

It still needs to be addressed.

PS: Coffee is irrelevant :D

@levitte
Copy link
Member

levitte commented Sep 5, 2019

I'm not convinced that this change has caused it.

All the new utility functions you added end up in libcrypto and are a part of it. I'm sure there is more leakage that we simply haven't noticed before, well, now.

@levitte
Copy link
Member

levitte commented Sep 5, 2019

I do note that there is a utility function remaining in providercommon.h with a name that starts with ossl_prov_. That's a precedent to follow.

@paulidale
Copy link
Contributor Author

Okay, I'll switch to ossl_prov_ for the function names.

@paulidale
Copy link
Contributor Author

Function names changed.

levitte
levitte requested changes Sep 6, 2019
View changes
providers/common/provider_util.c Outdated Show resolved Hide resolved
providers/common/provider_util.c Outdated Show resolved Hide resolved
providers/common/provider_util.c Outdated Show resolved Hide resolved
providers/common/provider_util.c Outdated Show resolved Hide resolved
providers/common/provider_util.c Outdated Show resolved Hide resolved
levitte
levitte reviewed Sep 6, 2019
View changes
providers/common/provider_util.c Outdated Show resolved Hide resolved
t8m
t8m reviewed Sep 6, 2019
View changes
providers/common/provider_util.c Outdated Show resolved Hide resolved
t8m
t8m reviewed Sep 6, 2019
View changes
providers/common/provider_util.c Outdated Show resolved Hide resolved
@levitte
Copy link
Member

levitte commented Sep 6, 2019

Travis is reporting aborts, among others when running the MAC tests with test/evp_test...

@paulidale
Copy link
Contributor Author

It's failing with a segmentation fault inside EVP_DigestSignInit on the final SHA512 test case in evpmac.txt. Unfortunately, my debugger isn't operating at the moment.

@levitte
Copy link
Member

levitte commented Sep 6, 2019

I can look at that abort some other day... won't have the time today, unfortunately

levitte pushed a commit that referenced this pull request Sep 7, 2019
Unify the digest getting code inside providers.
2f17cc4 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
CMAC using common cipher get code
1dcc7ee 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
GMAC using common cipher get code
76497ac 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
HMAC using common digest get code
103d8b0 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
KMAC using common digest get code
96d7e27 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Add 'engine' param to KDFs
c69561d 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Use common define for properties, engine, cipher and digest params
cb74317 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Use common digest getter for HKDF
86f17ed 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Use common digest getter for PBKDF2
e957226 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Use common digest getter for single step KDF
7e149b3 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Use common digest getter for TLS1 PRF
0f0db4d 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Use common digest getter for SSH KDF
a1de468 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
levitte pushed a commit that referenced this pull request Sep 7, 2019
Use common digest getter for X942 KDF
e97bab6 
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #9770)
@paulidale
Copy link
Contributor Author

Merged to master. Thanks.

@paulidale paulidale closed this Sep 7, 2019
3.0 New Core + FIPS automation moved this from Reviewer approved to Done Sep 7, 2019
@paulidale paulidale deleted the prov-common-digest branch September 19, 2019 02:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t8m t8m t8m left review comments

@slontis slontis slontis left review comments

@levitte levitte levitte approved these changes

Assignees
No one assigned
Labels
branch: master Merge to master branch
Projects
3.0 New Core + FIPS
  
Done
Milestone
No milestone
4 participants
@paulidale @levitte @t8m @slontis