Skip to content

X509 vfy continued#1161

Merged
alex merged 3 commits intopyca:masterfrom
reaperhulk:x509-vfy-continued
Jun 22, 2014
Merged

X509 vfy continued#1161
alex merged 3 commits intopyca:masterfrom
reaperhulk:x509-vfy-continued

Conversation

@reaperhulk
Copy link
Member

Builds on @lvh's work in #1156. Let's see if jenkins is okay with it.

@jenkins-cryptography
Copy link

Test PASSed.
Refer to this link for build results: https://jenkins.cryptography.io/job/cryptography-pr-experimental/2032/

Copy link
Member

Choose a reason for hiding this comment

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

Will comments in this style make Windows compiler mad?

Copy link
Member Author

Choose a reason for hiding this comment

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

It doesn't look like they do based on the passing Jenkins tests but maybe we should change that to /* */ anyway...

On Sat, Jun 21, 2014 at 6:35 PM, Alex Gaynor notifications@github.com
wrote:

@@ -165,6 +181,11 @@
"""

MACROS = """
+// X509_STORE_CTX

Will comments in this style make Windows compiler mad?

Reply to this email directly or view it on GitHub:
https://github.com/pyca/cryptography/pull/1161/files#r14052385

Copy link
Member

Choose a reason for hiding this comment

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

Interestingly I think some of those comments started as /**/ and then I changed them because some other comments were // already :)

Copy link
Member

Choose a reason for hiding this comment

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

(I suppose what I'm trying to say is that a wider // -> /**/ may be in order, and, if this doesn't make the buildbotses unhappy, that can happen on a separate PR)

Copy link
Member Author

Choose a reason for hiding this comment

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

Agreed on comment changes being a separate PR. That makes this one merge ready then!

On Sun, Jun 22, 2014 at 12:18 AM, Laurens Van Houtven
notifications@github.com wrote:

@@ -165,6 +181,11 @@
"""

MACROS = """
+// X509_STORE_CTX

(I suppose what I'm trying to say is that a wider // -> /**/ may be in order, and, if this doesn't make the buildbotses unhappy, that can happen on a separate PR)

Reply to this email directly or view it on GitHub:
https://github.com/pyca/cryptography/pull/1161/files#r14053169

@coveralls
Copy link

Coverage Status

Coverage remained the same when pulling 21d3105 on reaperhulk:x509-vfy-continued into 79a5130 on pyca:master.

alex added a commit that referenced this pull request Jun 22, 2014
@alex alex merged commit 940cb23 into pyca:master Jun 22, 2014
@reaperhulk reaperhulk deleted the x509-vfy-continued branch June 24, 2014 15:07
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 10, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Development

Successfully merging this pull request may close these issues.

5 participants