OpenVPN PolarSSL Support Preview [7/8]
PATCH 1/1 OpenVPN PolarSSL Support Preview [7/8]
Patch #7 in the series, adds PolarSSL support.
Note that PolarSSL support is against an as-yet-unreleased version of PolarSSL. The new version should be released somewhere in January/February.
Adriaan de Jong wrote:
Content-Description: 07_polarssl_addition.patch.gz
Quoted 8 lines
Add PolarSSL support to OpenVPN
+++ b/configure.ac Wed Dec 08 12:35:42 2010 +0100
(quoted diff) +0
-1@@ -273,14 +273,16 @@ ) AC_ARG_WITH([ssl-type], - [ --with-ssl-type=TYPE Build with the given SSL library, TYPE = openssl ],
Review line 285
Quoted 10 lines
(quoted diff) +3
-0+ [ --with-ssl-type=TYPE Build with the given SSL library, TYPE = openssl or polarssl ], [case "${withval}" in openssl) SSL_LIB=openssl ;; + polarssl) SSL_LIB=polarssl ;; *) AC_MSG_ERROR([bad value ${withval} for --with-ssl-type]) ;; esac], [SSL_LIB="openssl"] ) AM_CONDITIONAL([USE_OPENSSL], [test x$SSL_LIB = xopenssl]) +AM_CONDITIONAL([USE_POLARSSL], [test x$SSL_LIB = xpolarssl])
Again, I think --with-polarssl may be more common.
//Peter
Thanks, I'll change the configure options when I rebase the patches to 2.2 . I'm a little more familiar with cmake, thanks for pointing that out.
About the whitespace: it's a tad difficult to split the patches now. Are you sure it wouldn't be acceptable this way?
Adriaan
Quoted 42 lines
-----Original Message-----
From: Peter Stuge [mailto:[email protected]...]
Sent: vrijdag 10 december 2010 7:25
To: [email protected]
Subject: Re: [Openvpn-devel] [Patch] OpenVPN PolarSSL Support Preview [7/8]Adriaan de Jong wrote:
Content-Description: 07_polarssl_addition.patch.gzReview line 276
Quoted 8 lines
Add PolarSSL support to OpenVPN
+++ b/configure.ac Wed Dec 08 12:35:42 2010 +0100
(quoted diff) +0
-1@@ -273,14 +273,16 @@ ) AC_ARG_WITH([ssl-type], - [ --with-ssl-type=TYPE Build with the given SSL library, TYPE =openssl ],
Review line 276
Quoted 1 line
(quoted diff) +1
-0+ [ --with-ssl-type=TYPE Build with the given SSL library, TYPE =openssl or polarssl ],
Review line 280
Quoted 4 lines
(quoted diff) +1
-0[case "${withval}" in openssl) SSL_LIB=openssl ;; + polarssl) SSL_LIB=polarssl ;; *) AC_MSG_ERROR([bad value ${withval} for --with-ssl-type]);;
Review line 285
Quoted 5 lines
(quoted diff) +1
-0esac], [SSL_LIB="openssl"] ) AM_CONDITIONAL([USE_OPENSSL], [test x$SSL_LIB = xopenssl]) +AM_CONDITIONAL([USE_POLARSSL], [test x$SSL_LIB = xpolarssl])Again, I think --with-polarssl may be more common.
//Peter
-----------------------------------------------------------------------
-------
_______________________________________________
Openvpn-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openvpn-devel
Quoted 3 lines · Adriaan de Jong
Thanks, I'll change the configure options when I rebase the patches to 2.2 . I'm a little more familiar with cmake, thanks for pointing that out.
Great.
Quoted 1 line
About the whitespace: it's a tad difficult to split the patches now.
Simple with git. Check out how to do an interactive rebase.
git rebase --help /INTERACTIVE
//Peter
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Quoted 1 line · Adriaan de Jong
About the whitespace: it's a tad difficult to split the patches now. Are you sure it wouldn't be acceptable this way?
If I'm not entirely mistaken, these patches are based against a 2.1.x release and not the git tree at all. Considering that we're in the midst of getting the official 2.2 release out-the-door in about a month or so, I'd suggest that we primarily do code review now.
Adriaan can then rebase these patches against the git tree when I get the beta2.2 branch stabilised as a release branch. In this process, I'd expect Adriaan to also implement our review comments as well. I've discussed this with Adriaan on IRC already, and this seemed to me that this is what he would prefer.
Since this is a big round of patches, I do expect merge conflicts applying these patches unto the beta2.2 branch. Which means, Adriaan needs to rebase his patches anyway.
So, please high-light coding style issues so that he can fix that for the final round for the final inclusion into our git tree. But lets first of all this be a code review round so that Adriaan got something to work to get the final inclusion go smoother in the end.
Adriaan, will this work for you? Any other comments or thoughts?
kind regards,
David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
iEYEARECAAYFAk0B3RoACgkQDC186MBRfrp/nACglVEbUxG9n0Bp3Ttz2BDWgxkL ywoAnj6uCCeTMKLZ5vfAknS1M7HUWqjI
=d4Sp
-----END PGP SIGNATURE-----
Quoted 47 lines
-----Original Message-----
From: David Sommerseth [mailto:[email protected]...]
Sent: vrijdag 10 december 2010 8:56
To: Adriaan de Jong
Cc: Peter Stuge; [email protected]
Subject: Re: [Openvpn-devel] [Patch] OpenVPN PolarSSL Support Preview [7/8]-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1Quoted 1 line · Adriaan de Jong
About the whitespace: it's a tad difficult to split the patches now.
Are you sure it wouldn't be acceptable this way?
If I'm not entirely mistaken, these patches are based against a 2.1.x release and not the git tree at all. Considering that we're in the midst of getting the official 2.2 release out-the-door in about a month or so, I'd suggest that we primarily do code review now.
Adriaan can then rebase these patches against the git tree when I get the beta2.2 branch stabilised as a release branch. In this process, I'd
expect Adriaan to also implement our review comments as well. I've discussed this with Adriaan on IRC already, and this seemed to me that this is what he would prefer.Since this is a big round of patches, I do expect merge conflicts applying these patches unto the beta2.2 branch. Which means, Adriaan needs to rebase his patches anyway.
So, please high-light coding style issues so that he can fix that for the final round for the final inclusion into our git tree. But lets first of all this be a code review round so that Adriaan got something to work to get the final inclusion go smoother in the end.
Adriaan, will this work for you? Any other comments or thoughts?
kind regards,
David Sommerseth
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org/
Quoted 4 lines
iEYEARECAAYFAk0B3RoACgkQDC186MBRfrp/nACglVEbUxG9n0Bp3Ttz2BDWgxkL ywoAnj6uCCeTMKLZ5vfAknS1M7HUWqjI
=d4Sp
-----END PGP SIGNATURE-----
That's exactly what I was hoping for. I've tried to stay within any coding standards that I could find within the code. I'm making a note of any comments people have, and will include them in the actual 2.2 git rebase. As soon as that's done I can start making use of the other git commands.
Kind regards,
Adriaan
Quoted 2 lines · Adriaan de Jong
Quoted 2 lines
Quoted 2 lines
About the whitespace: it's a tad difficult to split the patches now. Are you sure it wouldn't be acceptable this way?
I may have misunderstood this. (I read "now" as "this late", but I guess maybe you meant "this early".)
Quoted 1 line
Quoted 1 line
I'd suggest that we primarily do code review now.
..
Quoted 1 line
Quoted 1 line
I'd expect Adriaan to also implement our review comments as well.
..
Quoted 5 lines
That's exactly what I was hoping for. I've tried to stay within any coding standards that I could find within the code. I'm making a note of any comments people have, and will include them in the actual 2.2 git rebase. As soon as that's done I can start making use of the other git commands.
I'd use git for the patches right away anyway, but that doesn't matter. My point about whitespace was not that it is a critical issue at this point, but something I think should be cleaned before inclusion. git would make it trivial to do (this early) so I think it's a good idea.
I'm afraid I'm unable to review the patches in greater depth. :\
//Peter
Quoted 8 lines
Quoted 2 lines · Adriaan de Jong
Quoted 2 lines
Quoted 2 lines
About the whitespace: it's a tad difficult to split the patches now. Are you sure it wouldn't be acceptable this way?
Peter Stuge wrote:
I may have misunderstood this. (I read "now" as "this late", but I guess maybe you meant "this early".)
You read it correctly, but let's retroactively change that to this early :)
Quoted 6 lines
I'd use git for the patches right away anyway, but that doesn't matter. My point about whitespace was not that it is a critical issue at this point, but something I think should be cleaned before inclusion. git would make it trivial to do (this early) so I think it's a good idea.
I'm afraid that we started off development based on checked out sources (quite a long time ago). I'll start rebasing to git as soon as I've heard that the git tree is stable.
Quoted 1 line
I'm afraid I'm unable to review the patches in greater depth. :\
Thanks for your feedback though, I'm not that familiar with autoconf's internals.
Adriaan
Quoted 5 lines · Adriaan de Jong
Quoted 1 line
I'd use git for the patches right away anyway,
I'm afraid that we started off development based on checked out sources (quite a long time ago). I'll start rebasing to git as soon as I've heard that the git tree is stable.
By git I don't mean the very latest contents of the tree, but the tool. I would branch off the commit that corresponds to your starting state, apply the patches, and then rebase that branch forward at some later time.
Having the branch in git allows iterating over the commits with great ease.
Thanks for these contributions! I think it's a significant improvement!
(I'd like to be able to reuse some of your work or at least learn from it, for the purpose of libssh2.)
//Peter
Am 10.12.2010 09:44, schrieb Peter Stuge:
Quoted 7 lines
Quoted 5 lines · Adriaan de Jong
Quoted 1 line
I'd use git for the patches right away anyway,
I'm afraid that we started off development based on checked out sources (quite a long time ago). I'll start rebasing to git as soon as I've heard that the git tree is stable.
Quoted 7 lines
By git I don't mean the very latest contents of the tree, but the tool. I would branch off the commit that corresponds to your starting state, apply the patches, and then rebase that branch forward at some later time.
Having the branch in git allows iterating over the commits with great ease.
OTOH, Adriaan has the patches in Mercurial Queues for now, so let's not waste time discussing this over and over again. :)
Signature · 1 line
Matthias Andree
Quoted 4 lines · Matthias Andree
Quoted 2 lines
Having the branch in git allows iterating over the commits with great ease.
let's not waste time discussing this over and over
I'm sorry I wasted your time.
//Peter