Commit 60a938c6 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

(oops) Apologies all, that last header-cleanup commit was from the wrong 

tree. This further reduces header interdependencies, and makes some
associated cleanups.
parent 3a87a9b9

crypto/asn1/t_req.c

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#include <openssl/objects.h>

#include <openssl/x509.h>

#include <openssl/x509v3.h>

#include <openssl/rsa.h>

#include <openssl/dsa.h>



#ifndef OPENSSL_NO_FP_API

int X509_REQ_print_fp(FILE *fp, X509_REQ *x)

crypto/asn1/t_spki.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#include "cryptlib.h"

#include <openssl/x509.h>

#include <openssl/asn1.h>

#include <openssl/rsa.h>

#include <openssl/dsa.h>



/* Print out an SPKI */

crypto/asn1/x_pubkey.c

+2 −0
Original line number Diff line number Diff line
@@ -60,6 +60,8 @@ 
#include "cryptlib.h"

#include <openssl/asn1t.h>

#include <openssl/x509.h>

#include <openssl/rsa.h>

#include <openssl/dsa.h>



/* Minor tweak to operation: free up EVP_PKEY */

static int pubkey_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it)

crypto/cryptlib.c

+0 −3
Original line number Diff line number Diff line
@@ -114,10 +114,7 @@ 
 * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.

 */



#include <stdio.h>

#include <string.h>

#include "cryptlib.h"

#include <openssl/crypto.h>

#include <openssl/safestack.h>



#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)

crypto/cversion.c

+0 −3
Original line number Diff line number Diff line
@@ -56,10 +56,7 @@ 
 * [including the GNU Public Licence.]

 */



#include <stdio.h>

#include <string.h>

#include "cryptlib.h"

#include <openssl/crypto.h>



#ifndef NO_WINDOWS_BRAINDEATH

#include "buildinf.h"