Commit d57611ea authored by Rich Salz's avatar Rich Salz
Browse files

ct_int.h only needed by crypto/ct 



Merge ct_int.h into ct_locl.h

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
parent 99cccf36

crypto/ct/ct_locl.h

+5 −1
Original line number Diff line number Diff line
@@ -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[];

crypto/ct/ct_x509v3.c

+1 −6
Original line number Diff line number Diff line
@@ -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)

{

crypto/include/internal/ct_int.h

deleted100644 → 0
+0 −75
Original line number Diff line number Diff line 
/*

 * Written by Dr Stephen N Henson (steve@openssl.org)

 * and Adam Eijdenberg (eijdenberg@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

 *    licensing@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 */