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.

Sign up for GitHub

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

Correct EVP_CIPHER_meth_new.pod and EVP_MD_meth_new.pod #4787

Closed
wants to merge 1 commit into from
Closed

Correct EVP_CIPHER_meth_new.pod and EVP_MD_meth_new.pod #4787

wants to merge 1 commit into from

Conversation

levitte
Copy link
Member

@levitte levitte commented Nov 24, 2017

One had some lines copied from the other, and both were missing a
proper RETURN VALUES section.

Fixes #4781

@levitte
Correct EVP_CIPHER_meth_new.pod and EVP_MD_meth_new.pod
92bd0aa 
One had some lines copied from the other, and both were missing a
proper RETURN VALUES section.

Fixes openssl#4781
@levitte levitte added 1.1.0 branch: master Merge to master branch labels Nov 24, 2017
t-j-h
t-j-h reviewed Nov 24, 2017
View reviewed changes
doc/man3/EVP_CIPHER_meth_new.pod
EVP_CIPHER_meth_set_get_asn1_params() sets the function for B<cipher>
that sets the cipher parameters based on an ASN.1 AlgorithmIdentifier
"parameter".
Both these functions are needed when there's a need for custom data
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"there's" change to "there is "

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Okie, will do. I'll have you note, though, that we have no agreement on this. Some of us don't want contractions, others aren't bothered by them.

t-j-h
t-j-h approved these changes Nov 24, 2017
View reviewed changes
Copy link
Member

@t-j-h t-j-h left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With minor comment adjustment

levitte added a commit that referenced this pull request Nov 24, 2017
@levitte
Correct EVP_CIPHER_meth_new.pod and EVP_MD_meth_new.pod
51e47d5 
One had some lines copied from the other, and both were missing a
proper RETURN VALUES section.

Fixes #4781

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from #4787)
levitte added a commit that referenced this pull request Nov 24, 2017
@levitte
Correct EVP_CIPHER_meth_new.pod and EVP_MD_meth_new.pod
6a3d2de 
One had some lines copied from the other, and both were missing a
proper RETURN VALUES section.

Fixes #4781

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from #4787)

(cherry picked from commit 51e47d5)
@levitte
Copy link
Member Author

levitte commented Nov 24, 2017

Merged.

master: 51e47d5
1.1.0: 6a3d2de

@levitte levitte closed this Nov 24, 2017
@mspncp
Copy link
Contributor

mspncp commented Nov 24, 2017

I am getting doc-nits errors which seem to be related with this PR:

$ make doc-nits
(cd .; /usr/bin/perl util/find-doc-nits -n -p ) >doc-nits
if [ -s doc-nits ] ; then cat doc-nits; rm doc-nits ; exit 1; fi
doc/man3/EVP_MD_meth_new.pod:1: EVP_MD_CTX_md_data missing from SYNOPSIS
make: *** [Makefile:489: doc-nits] Error 1

@levitte
Copy link
Member Author

levitte commented Nov 24, 2017

Okie, fixing, see #4789

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t-j-h t-j-h t-j-h approved these changes

Assignees
No one assigned
Labels
branch: master Merge to master branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@levitte @mspncp @t-j-h