From 7ddde6ec6bde3708298cc0a1ec4e7a09f9923dbd Mon Sep 17 00:00:00 2001
From: cameronrich <cameronrich@9a5d90b5-6617-0410-8a86-bb477d3ed2e3>
Date: Sun, 9 Jan 2011 22:19:05 +0000
Subject: [PATCH] Some fixes after scan-build.

git-svn-id: svn://svn.code.sf.net/p/axtls/code/trunk@193 9a5d90b5-6617-0410-8a86-bb477d3ed2e3
---
 ssl/test/ssltest.c | 9 ++-------
 ssl/tls1_clnt.c    | 7 +++++--
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/ssl/test/ssltest.c b/ssl/test/ssltest.c
index a2887b8ee..f26a881ef 100644
--- a/ssl/test/ssltest.c
+++ b/ssl/test/ssltest.c
@@ -515,7 +515,6 @@ static int RSA_test(void)
     bigint *plaintext_bi;
     bigint *enc_data_bi, *dec_data_bi;
     uint8_t enc_data2[128], dec_data2[128];
-    int size;
     int len; 
     uint8_t *buf;
 
@@ -546,7 +545,7 @@ static int RSA_test(void)
     }
 
     RSA_encrypt(rsa_ctx, (const uint8_t *)"abc", 3, enc_data2, 0);
-    size = RSA_decrypt(rsa_ctx, enc_data2, dec_data2, 1);
+    RSA_decrypt(rsa_ctx, enc_data2, dec_data2, 1);
     if (memcmp("abc", dec_data2, 3))
     {
         printf("Error: ENCRYPT/DECRYPT #2 failed\n");
@@ -921,17 +920,14 @@ static int SSL_server_test(
         
         if (size == SSL_CLOSE_NOTIFY)
         {
-            ret = SSL_OK;
+            /* do nothing */ 
         }
         else if (size < SSL_OK) /* got some alert or something nasty */
         {
             ret = size;
 
             if (ret == SSL_ERROR_CONN_LOST)
-            {
-                ret = SSL_OK;
                 continue;
-            }
 
             break;  /* we've got a problem */
         }
@@ -1092,7 +1088,6 @@ int SSL_server_tests(void)
 
         printf("SSL server test \"%s\" passed\n", "Bad Before Cert");
         TTY_FLUSH();
-        ret = 0;    /* is ok */
     }
 
     /* this test should fail */
diff --git a/ssl/tls1_clnt.c b/ssl/tls1_clnt.c
index 3fb7f627d..cb1be7724 100644
--- a/ssl/tls1_clnt.c
+++ b/ssl/tls1_clnt.c
@@ -51,7 +51,6 @@ EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const
         uint8_t *session_id, uint8_t sess_id_size)
 {
     SSL *ssl;
-    int ret;
 
     SOCKET_BLOCK(client_fd);    /* ensure blocking mode */
     ssl = ssl_new(ssl_ctx, client_fd);
@@ -70,7 +69,7 @@ EXP_FUNC SSL * STDCALL ssl_client_new(SSL_CTX *ssl_ctx, int client_fd, const
     }
 
     SET_SSL_FLAG(SSL_IS_CLIENT);
-    ret = do_client_connect(ssl);
+    do_client_connect(ssl);
     return ssl;
 }
 
@@ -130,6 +129,10 @@ int do_clnt_handshake(SSL *ssl, int handshake_type, uint8_t *buf, int hs_len)
             disposable_new(ssl);
             ret = do_client_connect(ssl);
             break;
+
+        default:
+            ret = SSL_ERROR_INVALID_HANDSHAKE;
+            break;
     }
 
     return ret;