Fix CMS_ContentInfo_free setting "content type not enveloped data" error for signed content #21676
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…A error for signed content CLA: provided
openssl-machine
added
the
hold: cla required
slontis
reviewed
Aug 8, 2023
openssl-machine
removed
the
hold: cla required
|
Also happens on 3.1 branch |
slontis
added
branch: master
|
Should this go back to 3.1 and 3.0? |
|
I probably had too much input into this to approve it.. Other committers will need to approve. |
mattcaswell
requested changes
Aug 8, 2023
mattcaswell
added
branch: 3.0
Yes, probably. |
mattcaswell
approved these changes
Aug 8, 2023
mattcaswell
removed
the
approval: otc review pending
t8m
approved these changes
Aug 8, 2023
t8m
added
approval: done
openssl-machine
added
approval: ready to merge
|
This pull request is ready to merge |
|
Squashed and merged to master, 3.0 and 3.1 branches. Thank you for your contribution. |
openssl-machine
pushed a commit
that referenced
this pull request
Aug 10, 2023
…ntInfo_free This happens if this function is called for signed content. Added ossl_cms_env_enc_content_free() for cleaning enveloped content. Fixed indentation in ossl_cms_env_enc_content_free Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #21676)
openssl-machine
pushed a commit
that referenced
this pull request
Aug 10, 2023
…ntInfo_free This happens if this function is called for signed content. Added ossl_cms_env_enc_content_free() for cleaning enveloped content. Fixed indentation in ossl_cms_env_enc_content_free Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #21676) (cherry picked from commit 13342ef)
openssl-machine
pushed a commit
that referenced
this pull request
Aug 10, 2023
…ntInfo_free This happens if this function is called for signed content. Added ossl_cms_env_enc_content_free() for cleaning enveloped content. Fixed indentation in ossl_cms_env_enc_content_free Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from #21676) (cherry picked from commit 13342ef)
xl32
pushed a commit
to xl32/openssl
that referenced
this pull request
Sep 29, 2023
…ntInfo_free This happens if this function is called for signed content. Added ossl_cms_env_enc_content_free() for cleaning enveloped content. Fixed indentation in ossl_cms_env_enc_content_free Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from openssl#21676) (cherry picked from commit 13342ef)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
CLA: provided
CMS_ContentInfo_free called ossl_cms_get0_env_enc_content, which called cms_get_enveloped_type, which raised error CMS_R_CONTENT_TYPE_NOT_ENVELOPED_DATA for the content info if it contained only signed data.
Checklist