[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  2b2b96847d7f22b24109a53a57c6d4d371209de3 (commit)
       via  11c8bc42f7b3c84588fa3354b91424df73471de1 (commit)
      from  3f3c7d26d577902a542bf226a091aab93ea1ff96 (commit)


- Log -----------------------------------------------------------------
commit 2b2b96847d7f22b24109a53a57c6d4d371209de3
Author: Rob Percival <robpercival at google.com>
Date:   Mon Mar 7 17:58:49 2016 +0000

    Minor update to includes and documentation for ct_test.c
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

commit 11c8bc42f7b3c84588fa3354b91424df73471de1
Author: Rob Percival <robpercival at google.com>
Date:   Mon Mar 7 17:58:14 2016 +0000

    Remove OPENSSL_NO_UNIT_TEST guard from ct_test.c
    
    Reviewed-by: Emilia Käsper <emilia at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 test/ct_test.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/ct_test.c b/test/ct_test.c
index 30e1ac6..90c3c08 100644
--- a/test/ct_test.c
+++ b/test/ct_test.c
@@ -1,5 +1,5 @@
 /*
- * Tests the Certificate Transparency public and internal APIs.
+ * Tests the Certificate Transparency public API.
  *
  * Author:      Rob Percival (robpercival at google.com)
  *
@@ -59,12 +59,12 @@
 
 #include <openssl/ct.h>
 #include <openssl/err.h>
-#include <openssl/ssl.h>
+#include <openssl/pem.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"
 
-#if !defined(OPENSSL_NO_CT) && !defined(OPENSSL_NO_UNIT_TEST)
+#ifndef OPENSSL_NO_CT
 
 /* Used when declaring buffers to read text files into */
 #define CT_TEST_MAX_FILE_SIZE 8096