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

Fix build with no-nextprotoneg #1100

Conversation

dirkfeytons
Copy link

Add a missing ifdef. Same change is already present in master.
Would be nice if 1.0.2 can also be built with no-nextprotoneg.

@mattcaswell
Copy link
Member

+1

@mattcaswell mattcaswell added this to the 1.0.2 milestone May 23, 2016
dirkfeytons added a commit to dirkfeytons/source that referenced this pull request Jun 9, 2016
NPN has been superseded by ALPN so NPN is disabled by default
The patch has been sent to OpenSSL for inclusion, see
openssl/openssl#1100

Signed-off-by: Dirk Feytons <dirk.feytons@gmail.com>
dirkfeytons added a commit to dirkfeytons/source that referenced this pull request Jun 9, 2016
NPN has been superseded by ALPN so NPN is disabled by default
The patch has been sent to OpenSSL for inclusion, see
openssl/openssl#1100

Signed-off-by: Dirk Feytons <dirk.feytons@gmail.com>
jow- pushed a commit to lede-project/source that referenced this pull request Jul 23, 2016
NPN has been superseded by ALPN so NPN is disabled by default
The patch has been sent to OpenSSL for inclusion, see
openssl/openssl#1100

Signed-off-by: Dirk Feytons <dirk.feytons@gmail.com>
chunkeey pushed a commit to chunkeey/apm82181-lede that referenced this pull request Jul 25, 2016
NPN has been superseded by ALPN so NPN is disabled by default
The patch has been sent to OpenSSL for inclusion, see
openssl/openssl#1100

Signed-off-by: Dirk Feytons <dirk.feytons@gmail.com>
@mattcaswell
Copy link
Member

Ping any team member. Looks straight forward.

@mattcaswell
Copy link
Member

@dirkfeytons please can you provide us with a CLA so we can use your patch? Details here:
https://www.openssl.org/policies/cla.html
Thanks!

@richsalz
Copy link
Contributor

+1

@richsalz richsalz added the approval: done This pull request has the required number of approvals label Aug 26, 2016
@mattcaswell mattcaswell added the hold: cla required The contributor needs to submit a license agreement label Aug 26, 2016
@dirkfeytons
Copy link
Author

@mattcaswell: I've just emailed the CLA to the address mentioned in the document.

@richsalz
Copy link
Contributor

got it, removed the hold label. can be merged.

@richsalz richsalz removed the hold: cla required The contributor needs to submit a license agreement label Sep 22, 2016
Add a missing ifdef. Same change is already present in master.
@dirkfeytons
Copy link
Author

@mattcaswell @richsalz I've just rebased on current OpenSSL_1_0_2-stable and fixed the email address in the commit. Sorry it took so long...

levitte pushed a commit that referenced this pull request Sep 22, 2016
Add a missing ifdef. Same change is already present in master.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from #1100)
@richsalz
Copy link
Contributor

commit f15a7e3. thanks!

@richsalz richsalz closed this Sep 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approval: done This pull request has the required number of approvals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants