Skip to content

Join the x509 and x509v3 directories#8925

Closed
levitte wants to merge 2 commits intoopenssl:masterfrom
levitte:join-x509-x509v3
Closed

Join the x509 and x509v3 directories#8925
levitte wants to merge 2 commits intoopenssl:masterfrom
levitte:join-x509-x509v3

Conversation

@levitte
Copy link
Member

@levitte levitte commented May 13, 2019

This has been long overdue.

Note that this does not join the X509 and X509V3 error modules, that
will be too many macro changes at this stage.

Fixes #8919

@levitte levitte added the branch: master Applies to master branch label May 13, 2019
@levitte
Copy link
Member Author

levitte commented May 13, 2019

Oh, I should probably add a note in CHANGES

@levitte
Copy link
Member Author

levitte commented May 13, 2019

Done

@levitte levitte mentioned this pull request May 13, 2019
Closed
@slontis
Copy link
Member

slontis commented May 27, 2019

Needs a rebase..

@slontis
Copy link
Member

slontis commented May 27, 2019

After collapsing the v3 folder, does not merging the error modules cause any issues if a new error code is added?

@levitte
Copy link
Member Author

levitte commented May 27, 2019

After collapsing the v3 folder, does not merging the error modules cause any issues if a new error code is added?

Nope. It turns out that several error modules can coexist in the same directory, as they all depend on the start of the _F_ and _R_ macro names.

levitte added 2 commits May 27, 2019 13:24
@levitte
Join the x509 and x509v3 directories
872130f 
This has been long overdue.

Note that this does not join the X509 and X509V3 error modules, that
will be too many macro changes at this stage.

Fixes openssl#8919
@levitte
fixup! Join the x509 and x509v3 directories
1e63d25
@levitte levitte force-pushed the join-x509-x509v3 branch from 22f4a66 to 1e63d25 Compare May 27, 2019 11:24
@levitte
Copy link
Member Author

levitte commented May 27, 2019

Rebase done

slontis
slontis requested changes May 27, 2019
View reviewed changes
Copy link
Member

@slontis slontis left a comment

Choose a reason for hiding this comment

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

Needs a rebase - I approve otherwise

@levitte
Copy link
Member Author

levitte commented May 27, 2019

Needs a rebase - I approve otherwise

So err, I did the rebase, I'll take that as approval.

@slontis
Copy link
Member

slontis commented May 27, 2019

The CI loop hasnt finished yet :)

@levitte
Copy link
Member Author

levitte commented May 27, 2019

One thing I haven't quite dived into is joining include/openssl/x509.h and include/openssl/x509v3.h... should that be part of this PR, or should I make a new PR for it?

@slontis
Copy link
Member

slontis commented May 27, 2019

new PR maybe

@levitte
Copy link
Member Author

levitte commented May 29, 2019

Merged.

878dc8d Join the x509 and x509v3 directories

@levitte levitte closed this May 29, 2019
levitte added a commit that referenced this pull request May 29, 2019
@levitte
Join the x509 and x509v3 directories
878dc8d 
This has been long overdue.

Note that this does not join the X509 and X509V3 error modules, that
will be too many macro changes at this stage.

Fixes #8919

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from #8925)
@richsalz
Copy link
Contributor

richsalz commented May 30, 2019

You'll have to make sure a stub x509v3 file exists to not break applications of course.

@mspncp
Copy link
Contributor

mspncp commented May 30, 2019

You'll have to make sure a stub x509v3 file exists to not break applications of course.

I guess you are talking about the x509v3.h include file? No public include files were modified by this commit:

git show --stat 878dc8dd9572 -- include

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

Reviewers

@slontis slontis slontis approved these changes

Assignees

No one assigned

Labels

branch: master Applies to master branch

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

x509 and x509v3 directories are intermixed and should perhaps be combined

4 participants

@levitte @slontis @richsalz @mspncp