[openssl-commits] [openssl] master update

[Dr. Stephen Henson]

The branch master has been updated
       via  9e313563da23f3dc0a6db557f708726234e3f653 (commit)
      from  bb1c5bbe6b5a5d3d21d4577fdf2d8e6f2bb78223 (commit)


- Log -----------------------------------------------------------------
commit 9e313563da23f3dc0a6db557f708726234e3f653
Author: Dr. Stephen Henson <steve at openssl.org>
Date:   Fri Aug 19 19:32:19 2016 +0100

    fix warning about trailing comma
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 apps/s_client.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/s_client.c b/apps/s_client.c
index 48e9b82d..f43a578 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -555,7 +555,7 @@ typedef enum OPTION_choice {
 #ifndef OPENSSL_NO_CT
     OPT_CT, OPT_NOCT, OPT_CTLOG_FILE,
 #endif
-    OPT_DANE_TLSA_RRDATA, OPT_DANE_EE_NO_NAME,
+    OPT_DANE_TLSA_RRDATA, OPT_DANE_EE_NO_NAME
 } OPTION_CHOICE;
 
 OPTIONS s_client_options[] = {