Commit 25a66ee3 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

Move cryptlib.h prior bio.h. Actually it makes sense to include cryptlib.h 

first everywhere in crypto and skip stdio.h and string.h [because it
includes them].
parent 0978dec1

crypto/asn1/a_strex.c

+5 −3
Original line number Diff line number Diff line
@@ -58,12 +58,12 @@ 


#include <stdio.h>

#include <string.h>

#include "cryptlib.h"

#include <openssl/crypto.h>

#include <openssl/x509.h>

#include <openssl/asn1.h>



#include "charmap.h"

#include "cryptlib.h"



/* ASN1_STRING_print_ex() and X509_NAME_print_ex().

 * Enhanced string and name printing routines handling
@@ -513,7 +513,7 @@ int X509_NAME_print_ex(BIO *out, X509_NAME *nm, int indent, unsigned long flags) 
	return do_name_ex(send_bio_chars, out, nm, indent, flags);

}





#ifndef OPENSSL_NO_FP_API

int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long flags)

{

	if(flags == XN_FLAG_COMPAT)
@@ -528,17 +528,19 @@ int X509_NAME_print_ex_fp(FILE *fp, X509_NAME *nm, int indent, unsigned long fla 
		}

	return do_name_ex(send_fp_chars, fp, nm, indent, flags);

}

#endif



int ASN1_STRING_print_ex(BIO *out, ASN1_STRING *str, unsigned long flags)

{

	return do_print_ex(send_bio_chars, out, flags, str);

}





#ifndef OPENSSL_NO_FP_API

int ASN1_STRING_print_ex_fp(FILE *fp, ASN1_STRING *str, unsigned long flags)

{

	return do_print_ex(send_fp_chars, fp, flags, str);

}

#endif



/* Utility function: convert any string type to UTF8, returns number of bytes

 * in output string or a negative error code

crypto/conf/conf_def.c

+1 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 


#include <stdio.h>

#include <string.h>

#include "cryptlib.h"

#include <openssl/stack.h>

#include <openssl/lhash.h>

#include <openssl/conf.h>
@@ -67,7 +68,6 @@ 
#include "conf_def.h"

#include <openssl/buffer.h>

#include <openssl/err.h>

#include "cryptlib.h"



static char *eat_ws(CONF *conf, char *p);

static char *eat_alpha_numeric(CONF *conf, char *p);

crypto/err/err.c

+1 −1
Original line number Diff line number Diff line
@@ -112,9 +112,9 @@ 
#include <stdio.h>

#include <stdarg.h>

#include <string.h>

#include "cryptlib.h"

#include <openssl/lhash.h>

#include <openssl/crypto.h>

#include "cryptlib.h"

#include <openssl/buffer.h>

#include <openssl/bio.h>

#include <openssl/err.h>

crypto/err/err_prn.c

+7 −2
Original line number Diff line number Diff line
@@ -57,9 +57,9 @@ 
 */



#include <stdio.h>

#include "cryptlib.h"

#include <openssl/lhash.h>

#include <openssl/crypto.h>

#include "cryptlib.h"

#include <openssl/buffer.h>

#include <openssl/err.h>
@@ -86,7 +86,12 @@ void ERR_print_errors_cb(int (*cb)(const char *str, size_t len, void *u), 
#ifndef OPENSSL_NO_FP_API

static int print_fp(const char *str, size_t len, void *fp)

	{

	return fprintf((FILE *)fp, "%s", str);

	BIO bio;



	BIO_set(&bio,BIO_s_file());

	BIO_set_fp(&bio,fp,BIO_NOCLOSE);



	return BIO_printf(&bio, "%s", str);

	}

void ERR_print_errors_fp(FILE *fp)

	{

crypto/hmac/hmac.c

+1 −1
Original line number Diff line number Diff line
@@ -58,8 +58,8 @@ 
#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <openssl/hmac.h>

#include "cryptlib.h"

#include <openssl/hmac.h>



void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len,

		  const EVP_MD *md, ENGINE *impl)