As promised, I've rebased the patches on the current master branch. They're
available here:

https://github.com/andj/openvpn-ssl-refactoring/commits/rebasedmaster  (i.e.
in the rebasedmaster branch of the openvpn-ssl-refactoring tree).

No major changes were necessary. I've skipped the unacked white-space patch,
as it was unacked :).

The changes that were made, other than
git-auto-fixed trailing white-space stuff:

 - base64_encode became openvpn_base64_encode at
https://github.com/andj/openvpn-ssl-refactoring/commit/61218d729e5190dddb27d4ff69da87910e095cee#L2L1497
(fix
for new code)
 - the new tls_username function was moved to the correct place:
https://github.com/andj/openvpn-ssl-refactoring/commit/a76d8c8dfb1b4aa22b08c254fa9f2f91baf7b770#L3R151
 - a new patch to fix a compiler warning:
https://github.com/andj/openvpn-ssl-refactoring/commit/f2ca3bf675c500b839c22d2db828a7a73a7054cc

If someone can ack these last few changes, then David can start merging!

Kind regards,
Adriaan de Jong

Reply via email to