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

kdf: make function naming consistent. #11996

Closed
wants to merge 1 commit into from
Closed

Conversation

paulidale
Copy link
Contributor

@paulidale paulidale commented May 30, 2020

The EVP_KDF_CTX functions have been renamed to bring consistency to the KDF naming.

Before 3.0 is released, the names are mutable and this prevents more inconsistencies being introduced.

There are no functional or code changes. Just the renaming and a little reformatting.

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

@paulidale paulidale added the branch: master Merge to master branch label May 30, 2020
@paulidale paulidale added this to the 3.0.0 milestone May 30, 2020
@paulidale
Copy link
Contributor Author

Travis is getting a timeout.

@levitte levitte mentioned this pull request Jun 1, 2020
2 tasks
@levitte
Copy link
Member

levitte commented Jun 1, 2020

I disagree with this change, on the same grounds as in #11997 (see #11997 (comment) for an explanation)

@paulidale
Copy link
Contributor Author

Bought the naming in line with #11997 using the command:

sed -i -e 's/EVP_KDF_CTX_new/EVP_KDF_new_ctx/g’               \
       -e 's/EVP_KDF_CTX_free/EVP_KDF_free_ctx/g’             \
       -e 's/EVP_KDF_CTX_dup/EVP_KDF_dup_ctx/g’               \
       -e 's/EVP_KDF_CTX_kdf/EVP_KDF_get_ctx_kdf/g’           \
       -e 's/EVP_KDF_CTX_get_params/EVP_KDF_get_ctx_params/g’ \
       -e 's/EVP_KDF_CTX_set_params/EVP_KDF_set_ctx_params/g' \
    `egrep -rl 'EVP_KDF_CTX_new|EVP_KDF_CTX_free|EVP_KDF_CTX_dup|EVP_KDF_CTX_kdf|EVP_KDF_CTX_get_params|EVP_KDF_CTX_set_params'`

The EVP_KDF_CTX_* functions have been relocated to the EVP_KDF_* namespace
for consistency.
@levitte levitte added this to Reviewer approved in 3.0 New Core + FIPS via automation Jun 9, 2020
@levitte levitte added the approval: done This pull request has the required number of approvals label Jun 9, 2020
@openssl-machine openssl-machine added approval: ready to merge The 24 hour grace period has passed, ready to merge and removed approval: done This pull request has the required number of approvals labels Jun 10, 2020
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

@paulidale
Copy link
Contributor Author

Merged to master. Thanks.

@paulidale paulidale closed this Jun 11, 2020
3.0 New Core + FIPS automation moved this from Reviewer approved to Done Jun 11, 2020
@paulidale paulidale deleted the ctx branch June 11, 2020 01:15
openssl-machine pushed a commit that referenced this pull request Jun 11, 2020
The EVP_KDF_CTX_* functions have been relocated to the EVP_KDF_* namespace
for consistency.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from #11996)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: ready to merge The 24 hour grace period has passed, ready to merge branch: master Merge to master branch
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

None yet

3 participants