Commit e527ba09 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Various changes to make this stuff compile under Win32 and VC++ with and 

without -debug option to mk1mf.pl. Change _export to is_export (_export is
a reserved word under VC++). Add yucky function prototype function pointer
casts. Sanitise the included files in crypto/x509v3.

Also changed ssleay.exe target to openssl.exe
parent 60e31c3a

crypto/rsa/rsa_oaep_test.c

+2 −1
Original line number Diff line number Diff line 
/* test vectors from p1ovect1.txt */



#include <stdio.h>

#include <rsa.h>

#include "e_os.h"

#include "rsa.h"



#define SetKey \

  key->n = BN_bin2bn(n, sizeof(n)-1, key->n); \

crypto/x509v3/v3_akey.c

+4 −6
Original line number Diff line number Diff line
@@ -57,12 +57,10 @@ 
 */



#include <stdio.h>

#include <stdlib.h>

#include <pem.h>

#include <asn1_mac.h>

#include <err.h>

#include <objects.h>

#include <conf.h>

#include "cryptlib.h"

#include "conf.h"

#include "asn1.h"

#include "asn1_mac.h"

#include "x509v3.h"



#ifndef NOPROTO

crypto/x509v3/v3_alt.c

+8 −12
Original line number Diff line number Diff line
@@ -57,22 +57,18 @@ 
 */



#include <stdio.h>

#include <stdlib.h>

#include <pem.h>

#include <asn1_mac.h>

#include <err.h>

#include <objects.h>

#include <conf.h>

#include "cryptlib.h"

#include "conf.h"

#include "x509v3.h"



#ifndef NOPROTO

STACK *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);

STACK *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);

static STACK *v2i_subject_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);

static STACK *v2i_issuer_alt(X509V3_EXT_METHOD *method, X509V3_CTX *ctx, STACK *nval);

static int copy_email(X509V3_CTX *ctx, STACK *gens);

static int copy_issuer(X509V3_CTX *ctx, STACK *gens);

#else

STACK *v2i_issuer_alt();

STACK *v2i_subject_alt();

static STACK *v2i_issuer_alt();

static STACK *v2i_subject_alt();

static int copy_email();

static int copy_issuer();

#endif
@@ -170,7 +166,7 @@ STACK *ret; 
	return ret;

}



STACK *v2i_issuer_alt(method, ctx, nval)

static STACK *v2i_issuer_alt(method, ctx, nval)

X509V3_EXT_METHOD *method;

X509V3_CTX *ctx;

STACK *nval;
@@ -239,7 +235,7 @@ STACK *gens; 
	

}



STACK *v2i_subject_alt(method, ctx, nval)

static STACK *v2i_subject_alt(method, ctx, nval)

X509V3_EXT_METHOD *method;

X509V3_CTX *ctx;

STACK *nval;

crypto/x509v3/v3_bcons.c

+5 −6
Original line number Diff line number Diff line
@@ -56,13 +56,12 @@ 
 *

 */





#include <stdio.h>

#include <stdlib.h>

#include <pem.h>

#include <asn1_mac.h>

#include <err.h>

#include <objects.h>

#include <conf.h>

#include "cryptlib.h"

#include "asn1.h"

#include "asn1_mac.h"

#include "conf.h"

#include "x509v3.h"



#ifndef NOPROTO

crypto/x509v3/v3_bitst.c

+2 −6
Original line number Diff line number Diff line
@@ -57,12 +57,8 @@ 
 */



#include <stdio.h>

#include <stdlib.h>

#include <pem.h>

#include <asn1_mac.h>

#include <err.h>

#include <objects.h>

#include <conf.h>

#include "cryptlib.h"

#include "conf.h"

#include "x509v3.h"



#ifndef NOPROTO