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

ParseC.pm: gracefully handle DOS-style end-of-line in source files #19686

Closed
wants to merge 2 commits into from

Conversation

DDvO
Copy link
Contributor

@DDvO DDvO commented Nov 15, 2022

Prevent weird hick-ups like:

Unmatched parentheses at include/openssl/asn1.h line 520

make[1]: *** [Makefile:4757: util/libcrypto.num] Error 255
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:3387: build_sw] Error 2

during builds in case header files in include/openss/ happen to have \r\n at line ends,
which can happen when a git clone or git checkout gets the line end conversion wrong,
which can happen easily (by default?) on Windows Subsystem for Linux (WSL).

The issue can reproduced easily also on 'real' Linux by

unix2dos include/openssl/asn1.h.in
make -s -j
Checklist
  • documentation is added or updated
  • tests are added or updated

When header files happen to have \r\n at line end, prevent hick-ups like:

Unmatched parentheses at include/openssl/asn1.h line 520

make[1]: *** [Makefile:4757: util/libcrypto.num] Error 255
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:3387: build_sw] Error 2
@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: bug The issue/pr is/fixes a bug branch: 3.0 Merge to openssl-3.0 branch labels Nov 15, 2022
@t8m t8m added the tests: exempted The PR is exempt from requirements for testing label Nov 15, 2022
util/perl/OpenSSL/ParseC.pm Outdated Show resolved Hide resolved
@levitte levitte added the branch: 3.1 Merge to openssl-3.1 label Nov 16, 2022
@levitte
Copy link
Member

levitte commented Nov 16, 2022

I added the label for the 3.1 branch, as it should be cherry-picked there too.

@levitte levitte removed the approval: otc review pending This pull request needs review by an OTC member label Nov 16, 2022
@t8m t8m 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 Nov 16, 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 Nov 17, 2022
@openssl-machine
Copy link
Collaborator

This pull request is ready to merge

openssl-machine pushed a commit that referenced this pull request Nov 18, 2022
When header files happen to have \r\n at line end, prevent hick-ups like:

Unmatched parentheses at include/openssl/asn1.h line 520

make[1]: *** [Makefile:4757: util/libcrypto.num] Error 255
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:3387: build_sw] Error 2

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from #19686)
openssl-machine pushed a commit that referenced this pull request Nov 18, 2022
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from #19686)

(cherry picked from commit c507db9)
@DDvO
Copy link
Contributor Author

DDvO commented Nov 18, 2022

Merged to master, 3.1, and 3.0.

Thanks @levitte for the improvement and also to @t8m for the swift approval.

openssl-machine pushed a commit that referenced this pull request Nov 18, 2022
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from #19686)

(cherry picked from commit c507db9)
@DDvO DDvO closed this Nov 18, 2022
beldmit pushed a commit to beldmit/openssl that referenced this pull request Dec 26, 2022
When header files happen to have \r\n at line end, prevent hick-ups like:

Unmatched parentheses at include/openssl/asn1.h line 520

make[1]: *** [Makefile:4757: util/libcrypto.num] Error 255
make[1]: *** Waiting for unfinished jobs....
make: *** [Makefile:3387: build_sw] Error 2

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: David von Oheimb <david.von.oheimb@siemens.com>
(Merged from openssl#19686)
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 branch: 3.0 Merge to openssl-3.0 branch branch: 3.1 Merge to openssl-3.1 tests: exempted The PR is exempt from requirements for testing triaged: bug The issue/pr is/fixes a bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants