The branch master has been updated via d57611ea1fa8be1930dfbc3f113674348d11f14c (commit) from 99cccf3643f96892196578cb599ca91661a7128c (commit)
- Log ----------------------------------------------------------------- commit d57611ea1fa8be1930dfbc3f113674348d11f14c Author: Rich Salz <rs...@openssl.org> Date: Sun Mar 20 10:14:13 2016 -0400 ct_int.h only needed by crypto/ct Merge ct_int.h into ct_locl.h Reviewed-by: Viktor Dukhovni <vik...@openssl.org> ----------------------------------------------------------------------- Summary of changes: crypto/ct/ct_locl.h | 6 +++- crypto/ct/ct_x509v3.c | 7 +--- crypto/include/internal/ct_int.h | 75 ---------------------------------------- 3 files changed, 6 insertions(+), 82 deletions(-) delete mode 100644 crypto/include/internal/ct_int.h diff --git a/crypto/ct/ct_locl.h b/crypto/ct/ct_locl.h index 66a6d1c..659120b 100644 --- a/crypto/ct/ct_locl.h +++ b/crypto/ct/ct_locl.h @@ -55,10 +55,10 @@ #endif #include <stddef.h> - #include <openssl/ct.h> #include <openssl/evp.h> #include <openssl/x509.h> +#include <openssl/x509v3.h> #include <openssl/safestack.h> /* @@ -214,3 +214,7 @@ __owur int SCT_is_complete(const SCT *sct); __owur int SCT_signature_is_complete(const SCT *sct); +/* + * Handlers for Certificate Transparency X509v3/OCSP extensions + */ +extern const X509V3_EXT_METHOD v3_ct_scts[]; diff --git a/crypto/ct/ct_x509v3.c b/crypto/ct/ct_x509v3.c index db2c0e4..ac37231 100644 --- a/crypto/ct/ct_x509v3.c +++ b/crypto/ct/ct_x509v3.c @@ -60,12 +60,7 @@ # error "CT is disabled" #endif -#include <openssl/bio.h> -#include <openssl/ct.h> -#include <openssl/obj_mac.h> -#include <openssl/x509v3.h> - -#include "internal/ct_int.h" +#include "ct_locl.h" static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val) { diff --git a/crypto/include/internal/ct_int.h b/crypto/include/internal/ct_int.h deleted file mode 100644 index 99b9332..0000000 --- a/crypto/include/internal/ct_int.h +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Written by Dr Stephen N Henson (st...@openssl.org) - * and Adam Eijdenberg (eijdenb...@google.com) for the OpenSSL project 2015. - */ -/* ==================================================================== - * Copyright (c) 2015 The OpenSSL Project. All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * - * 3. All advertising materials mentioning features or use of this - * software must display the following acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)" - * - * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to - * endorse or promote products derived from this software without - * prior written permission. For written permission, please contact - * licens...@openssl.org. - * - * 5. Products derived from this software may not be called "OpenSSL" - * nor may "OpenSSL" appear in their names without prior written - * permission of the OpenSSL Project. - * - * 6. Redistributions of any form whatsoever must retain the following - * acknowledgment: - * "This product includes software developed by the OpenSSL Project - * for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)" - * - * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY - * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE OpenSSL PROJECT OR - * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * ==================================================================== - * - */ -#ifndef HEADER_CT_INT_H -# define HEADER_CT_INT_H - -# ifdef __cplusplus -extern "C" { -# endif - -# ifdef OPENSSL_NO_CT -# error CT is disabled. -# endif - -# include <openssl/ct.h> -# include <openssl/x509v3.h> - -/* Handlers for Certificate Transparency X509v3/OCSP extensions */ -extern const X509V3_EXT_METHOD v3_ct_scts[]; - -# ifdef __cplusplus -} -# endif - -#endif /* HEADER_CT_INT_H */ _____ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits