[Openvpn-devel] documentation: cherry-pick two polarssl fixes to 2.3

[Gert Doering]

Hi,

Steffann just notified me of two master/ fixes that should have gone
to release/2.3 as well - removing unused variables and fixing dead code
in the polarssl bits.  Usually I'd just put the note "also applied to 2.3"
in the commit-and-push reply mail, but that was quite a while ago - so,
git log and diff here, for full transparency regarding code changes.

gert

commit 2b9b3e598dc5bedc638ebc0a1877b36224398f0f
Author: Yegor Yefremov <yegorsli...@googlemail.com>
List-Post: openvpn-devel@lists.sourceforge.net
Date:   Sun Nov 23 13:21:43 2014 +0100

    polarssl: fix unreachable code
    
    Found via cppcheck and compile-tested.
    
    Signed-off-by: Yegor Yefremov <yegorsli...@googlemail.com>
    Acked-by: Steffan Karger <steffan.kar...@fox-it.com>
    Message-Id: <1416745303-23641-1-git-send-email-yegorsli...@googlemail.com>
    URL: http://article.gmane.org/gmane.network.openvpn.devel/9266
    Signed-off-by: Gert Doering <g...@greenie.muc.de>
    (cherry picked from commit 98c5de769d6bcd4822b2fd81ae4f4b05edff5c0e)

commit 029138790b00df54ec98eec04e05b494bcf30a94
Author: Steffan Karger <stef...@karger.me>
List-Post: openvpn-devel@lists.sourceforge.net
Date:   Sun Jan 12 20:39:31 2014 +0100

    Remove unused variables from ssl_verify_polarssl.c's x509_get_serial()
    
    Signed-off-by: Steffan Karger <stef...@karger.me>
    Acked-by: Gert Doering <g...@greenie.muc.de>
    Message-Id: <1389555572-6210-3-git-send-email-stef...@karger.me>
    URL: http://article.gmane.org/gmane.network.openvpn.devel/8222
    Signed-off-by: Gert Doering <g...@greenie.muc.de>
    (cherry picked from commit 7a85a6fafacba186ae2fc495d32e159ea9a57e0e)


diff --git a/src/openvpn/ssl_polarssl.c b/src/openvpn/ssl_polarssl.c
index 562ace0..32566e4 100644
--- a/src/openvpn/ssl_polarssl.c
+++ b/src/openvpn/ssl_polarssl.c
@@ -815,8 +815,8 @@ key_state_write_plaintext (struct key_state_ssl *ks, struct 
buffer *buf)
 
   if (0 == buf->len)
     {
-      return 0;
       perf_pop ();
+      return 0;
     }
 
   retval = ssl_write(ks->ctx, BPTR(buf), buf->len);
diff --git a/src/openvpn/ssl_verify_polarssl.c 
b/src/openvpn/ssl_verify_polarssl.c
index 3a1ef48..c39fc7c 100644
--- a/src/openvpn/ssl_verify_polarssl.c
+++ b/src/openvpn/ssl_verify_polarssl.c
@@ -127,8 +127,6 @@ x509_get_username (char *cn, int cn_len,
 char *
 backend_x509_get_serial (openvpn_x509_cert_t *cert, struct gc_arena *gc)
 {
-  int ret = 0;
-  int i = 0;
   char *buf = NULL;
   size_t buflen = 0;
   mpi serial_mpi = { 0 };
-- 
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             g...@greenie.muc.de
fax: +49-89-35655025                        g...@net.informatik.tu-muenchen.de

signature.asc
Description: PGP signature