generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ct_int.h only needed by crypto/ct

Browse Source 
Merge ct_int.h into ct_locl.h

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
This commit is contained in:
Rich Salz 2016-03-20 10:14:13 -04:00
parent 99cccf3643
commit d57611ea1f
3 changed files with 6 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crypto/ct/ct_locl.h
View File

@ -55,10 +55,10 @@
#endif #endif
#include <stddef.h> #include <stddef.h>
#include <openssl/ct.h> #include <openssl/ct.h>
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/x509.h> #include <openssl/x509.h>
#include <openssl/x509v3.h>
#include <openssl/safestack.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); __owur int SCT_signature_is_complete(const SCT *sct);
/*
* Handlers for Certificate Transparency X509v3/OCSP extensions
*/
extern const X509V3_EXT_METHOD v3_ct_scts[];

7
crypto/ct/ct_x509v3.c
View File

@ -60,12 +60,7 @@
# error "CT is disabled" # error "CT is disabled"
#endif #endif
#include <openssl/bio.h> #include "ct_locl.h"
#include <openssl/ct.h>
#include <openssl/obj_mac.h>
#include <openssl/x509v3.h>
#include "internal/ct_int.h"
static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val) static char *i2s_poison(const X509V3_EXT_METHOD *method, void *val)
{ {

75
crypto/include/internal/ct_int.h
View File

@ -1,75 +0,0 @@
/*
* 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 */