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

APPS: generalize load_csr() and remove obsolete OBJ_create() #18900

Closed
wants to merge 3 commits into from

Conversation

DDvO
Copy link
Contributor

@DDvO DDvO commented Jul 28, 2022

This has been carved out of #16006 and slightly extended.

  • Move load_csr_autofmt() from apps/cmp.c to apps.c and use it also for other apps
  • apps/x509.c: Remove legacy call to OBJ_create()

@DDvO DDvO added branch: master Merge to master branch approval: review pending This pull request needs review by a committer approval: otc review pending This pull request needs review by an OTC member triaged: feature The issue/pr requests/adds a feature triaged: refactor The issue/pr requests/implements refactoring triaged: cleanup The issue/pr deals with cleanup of comments/docs not altering code significantly labels Jul 28, 2022
Copy link
Member

@beldmit beldmit left a comment

Choose a reason for hiding this comment

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

LGTM

@beldmit beldmit removed the approval: otc review pending This pull request needs review by an OTC member label Jul 28, 2022
@DDvO
Copy link
Contributor Author

DDvO commented Jul 30, 2022

Asking @openssl/committers for 2nd review.

@DDvO
Copy link
Contributor Author

DDvO commented Aug 5, 2022

Also here, ping https://github.com/orgs/openssl/teams/committers for 2nd approval.

@DDvO
Copy link
Contributor Author

DDvO commented Aug 15, 2022

Ping @openssl/committers for 2nd review.

@t8m t8m closed this Aug 16, 2022
@t8m t8m reopened this Aug 16, 2022
@t8m
Copy link
Member

t8m commented Aug 16, 2022

Hmm, I am not sure about this as this changes the behavior to not enforce the PEM/DER format but just try first the format from the option. For X.509s we do not enforce the format by default but once the -inform is used it is enforced.

@openssl-machine
Copy link
Collaborator

This PR is in a state where it requires action by @openssl/committers but the last update was 30 days ago

@DDvO
Copy link
Contributor Author

DDvO commented Sep 16, 2022

Hmm, I am not sure about this as this changes the behavior to not enforce the PEM/DER format but just try first the format from the option. For X.509s we do not enforce the format by default but once the -inform is used it is enforced.

Oh, @t8m I just noticed that I overlooked your comment so far.
Changed the behavior in this way: if -inform is explicitly given, only this format is used.

@DDvO
Copy link
Contributor Author

DDvO commented Sep 16, 2022

The failing non-caching CI run is certainly unrelated:

crypto/property/defn_cache.c:117: OpenSSL internal error: Assertion failed: old == NULL
../../util/wrap.pl ../../test/threadstest -config /home/runner/work/openssl/openssl/test/default.cnf ../../test/recipes/90-test_threads_data => 134

@DDvO DDvO requested a review from t8m September 19, 2022 10:40
@t8m
Copy link
Member

t8m commented Sep 19, 2022

@beldmit still OK?

@beldmit
Copy link
Member

beldmit commented Sep 19, 2022

Yes, still OK.

@DDvO DDvO added approval: done This pull request has the required number of approvals and removed approval: review pending This pull request needs review by a committer labels Sep 19, 2022
@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 Sep 20, 2022
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Sep 20, 2022
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from #18900)
openssl-machine pushed a commit that referenced this pull request Sep 20, 2022
…so for apps, too

Also add related references to FR #15725.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from #18900)
@DDvO
Copy link
Contributor Author

DDvO commented Sep 20, 2022

Merged - thanks @beldmit and @t8m

@DDvO DDvO closed this Sep 20, 2022
sftcd pushed a commit to sftcd/openssl that referenced this pull request Sep 24, 2022
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from openssl#18900)
sftcd pushed a commit to sftcd/openssl that referenced this pull request Sep 24, 2022
…so for apps, too

Also add related references to FR openssl#15725.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from openssl#18900)
beldmit pushed a commit to beldmit/openssl that referenced this pull request Dec 26, 2022
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from openssl#18900)
beldmit pushed a commit to beldmit/openssl that referenced this pull request Dec 26, 2022
…so for apps, too

Also add related references to FR openssl#15725.

Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from openssl#18900)
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 triaged: cleanup The issue/pr deals with cleanup of comments/docs not altering code significantly triaged: feature The issue/pr requests/adds a feature triaged: refactor The issue/pr requests/implements refactoring
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants