Skip to content

Fixes to openssl compatibility for Boost.Asio with SSF - #1739

Merged
toddouska merged 6 commits into
wolfSSL:masterfrom
dgarske:asio
Aug 14, 2018
Merged

Fixes to openssl compatibility for Boost.Asio with SSF#1739
toddouska merged 6 commits into
wolfSSL:masterfrom
dgarske:asio

Conversation

@dgarske

@dgarskedgarske commented Aug 2, 2018•
edited
Loading

Copy link
Copy Markdown
Member
  • Fixes for asio build options (so includes OPENSSL_EXTRA).
  • Fix for bad named variable shutdown.
  • Fix for the side size in Options struct to support WOLFSSL_SIDE_NEITHER (3).
  • Fix to set the side on wolfSSL_connect() or wolfSSL_accept().
  • Fix for BIO_wpending to work correctly.
  • Fix for DH max size calc not including DH_Pub.
  • Fix for PemToDer which was not properly handling extra new lines at end of file.

@dgarskedgarske self-assigned this Aug 2, 2018
MJSPollard
MJSPollard approved these changes Aug 7, 2018
View reviewed changes

@MJSPollardMJSPollard left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

These changes look good to me and test out correctly when testing with Boost.Asio 1_67_0, the standalone Asio library, and various OSP's.

@dgarskedgarske assigned toddouska and dgarske and unassigned dgarske and toddouskaAug 7, 2018
@dgarskedgarske mentioned this pull request Aug 10, 2018
Merged
@dgarskedgarske assigned toddouska and unassigned dgarskeAug 10, 2018
toddouska
toddouska reviewed Aug 13, 2018
View reviewed changes
Comment threadsrc/bio.c Outdated

@toddouskatoddouskaAug 13, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

wolfSSL_pending() returns the number of buffered readable plaintext bytes. Not writable.

@dgarskedgarskeAug 13, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Okay I'll take a look at this again. Thanks

Comment threadwolfcrypt/src/asn.c Outdated

@toddouskatoddouskaAug 13, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

info->consumed marker was added for a reason, why are we removing it?

@dgarskedgarskeAug 13, 2018

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

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

Its not removed, it get updated correctly in the lines below.

@dgarske
Fixes for asio build options (so includes OPENSSL_EXTRA). Fix for bad…
17e102d
… named variable `shutdown`. Fix for the side size in Options struct to support `WOLFSSL_SIDE_NEITHER` (3). Fix to set the side on wolfSS_connect() or wolfSS_accept().
@dgarske
Fix for BIO_wpending to work correctly.
eca6471
@dgarske
Fix for PemToDer which was not properly handling extra new lines at e…
7b83db0
…nd of file.
@dgarske
Fix for DH max size calc not including DH_Pub.
ff7d2fe
@dgarske
Fix to handle carriage return case in PEM end of line character handl…
6ca56ee
…ing (for Windows). Cleanup to consolidate duplicate end of line character handling code.
@dgarske
Fix for BIO ssl case, which is not supported (for the Boost.Asio proj…
f23915b
…ect this isn't required either).
@dgarske

dgarske commented Aug 14, 2018

Copy link
Copy Markdown
MemberAuthor

@toddouska : Fixed the wolfSSL_BIO_wpending ssl case. Marked as not supported (also not used for the Boost.Asio project).

@dgarskedgarske removed their assignment Aug 14, 2018
@toddouska
toddouska merged commit e2de988 into wolfSSL:masterAug 14, 2018
@dgarske
dgarske deleted the asio branch August 15, 2018 00:55
@MJSPollardMJSPollard mentioned this pull request Aug 9, 2018
Closed
onchain-labx7yv3 added a commit to onchain-labx7yv3/osp that referenced this pull request Sep 28, 2025
@onchain-labx7yv3
Changes to support wolfSSL compatibility layer. Build wolfssl using `…
0ed0011
…./configure --enable-asio`. Requires wolfSSL/wolfssl#1739
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@toddouskatoddouskatoddouska approved these changes
@JacobBarthelmehJacobBarthelmehAwaiting requested review from JacobBarthelmeh
+1 more reviewer
@MJSPollardMJSPollardMJSPollard approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

@toddouskatoddouska

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@dgarske@toddouska@MJSPollard