Commit 213a75db authored by Ben Laurie's avatar Ben Laurie
Browse files

Make samples compile.

parent 5c0a4865

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -5,6 +5,9 @@ 


 Changes between 0.9.3a and 0.9.4



  *) Make S/MIME samples compile (not yet tested).

     [Ben Laurie]



  *) Additional typesafe stacks.

     [Ben Laurie]

crypto/pkcs7/Makefile.ssl

+14 −0
Original line number Diff line number Diff line
@@ -39,6 +39,20 @@ test: 


all:	lib



testapps: enc dec sign verify



enc: enc.o lib

	$(CC) $(CFLAGS) -o enc enc.o $(LIB)



dec: dec.o lib

	$(CC) $(CFLAGS) -o dec dec.o $(LIB)



sign: sign.o lib

	$(CC) $(CFLAGS) -o sign sign.o $(LIB)



verify: verify.o example.o lib

	$(CC) $(CFLAGS) -o verify verify.o example.o $(LIB)



lib:	$(LIBOBJ)

	$(AR) $(LIB) $(LIBOBJ)

	$(RANLIB) $(LIB)

crypto/pkcs7/dec.c

+4 −4
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ int main(argc,argv) 
int argc;

char *argv[];

	{

	char *keyfile;

	char *keyfile=NULL;

	BIO *in;

	EVP_PKEY *pkey;

	X509 *x509;
@@ -83,7 +83,7 @@ char *argv[]; 
	char buf[1024*4];

	unsigned char *pp;

	int i,printit=0;

	STACK *sk;

	STACK_OF(PKCS7_SIGNER_INFO) *sk;



	SSLeay_add_all_algorithms();

	bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
@@ -175,9 +175,9 @@ char *argv[]; 
		/* Ok, first we need to, for each subject entry,

		 * see if we can verify */

		ERR_clear_error();

		for (i=0; i<sk_num(sk); i++)

		for (i=0; i<sk_PKCS7_SIGNER_INFO_num(sk); i++)

			{

			si=(PKCS7_SIGNER_INFO *)sk_value(sk,i);

			si=sk_PKCS7_SIGNER_INFO_value(sk,i);

			i=PKCS7_dataVerify(cert_store,&cert_ctx,p7bio,p7,si);

			if (i <= 0)

				goto err;

crypto/pkcs7/enc.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ char *argv[]; 
	int i;

	int nodetach=1;

	char *keyfile = NULL;

	const EVP_CIPHER *cipher;

	const EVP_CIPHER *cipher=NULL;



	SSLeay_add_all_algorithms();

crypto/pkcs7/example.c

+11 −17
Original line number Diff line number Diff line 
#include <stdio.h>

#include <stdlib.h>

#include <malloc.h>

#include <openssl/pkcs7.h>

#include <openssl/asn1_mac.h>



int add_signed_time(PKCS7_SIGNER_INFO *si)

	{
@@ -18,19 +18,16 @@ int add_signed_time(PKCS7_SIGNER_INFO *si) 
ASN1_UTCTIME *get_signed_time(PKCS7_SIGNER_INFO *si)

	{

	ASN1_TYPE *so;

	ASN1_UTCTIME *ut;



	so=PKCS7_get_signed_attribute(si,NID_pkcs9_signingTime);

	if (so->type == V_ASN1_UTCTIME)

		{

		ut=so->value.utctime;

		}

	return(ut);

	    return so->value.utctime;

	return NULL;

	}

	

static int signed_string_nid= -1;



int add_signed_string(PKCS7_SIGNER_INFO *si, char *str)

void add_signed_string(PKCS7_SIGNER_INFO *si, char *str)

	{

	ASN1_OCTET_STRING *os;
@@ -80,7 +77,7 @@ int add_signed_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2) 
	unsigned char *p;

	ASN1_OCTET_STRING *os1,*os2;

	ASN1_STRING *seq;

	char *data;

	unsigned char *data;

	int i,total;



	if (signed_seq2string_nid == -1)
@@ -178,19 +175,16 @@ X509_ATTRIBUTE *create_time(void) 
	return(ret);

	}



ASN1_UTCTIME *sk_get_time(STACK *sk)

ASN1_UTCTIME *sk_get_time(STACK_OF(X509_ATTRIBUTE) *sk)

	{

	ASN1_TYPE *so;

	ASN1_UTCTIME *ut;

	PKCS7_SIGNER_INFO si;



	si.auth_attr=sk;

	so=PKCS7_get_signed_attribute(&si,NID_pkcs9_signingTime);

	if (so->type == V_ASN1_UTCTIME)

		{

		ut=so->value.utctime;

		}

	return(ut);

	    return so->value.utctime;

	return NULL;

	}

	

X509_ATTRIBUTE *create_string(char *str)
@@ -210,7 +204,7 @@ X509_ATTRIBUTE *create_string(char *str) 
	return(ret);

	}



int sk_get_string(STACK *sk, char *buf, int len)

int sk_get_string(STACK_OF(X509_ATTRIBUTE) *sk, char *buf, int len)

	{

	ASN1_TYPE *so;

	ASN1_OCTET_STRING *os;
@@ -247,7 +241,7 @@ X509_ATTRIBUTE *add_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2) 
	ASN1_OCTET_STRING *os1,*os2;

	ASN1_STRING *seq;

	X509_ATTRIBUTE *ret;

	char *data;

	unsigned char *data;

	int i,total;



	if (signed_seq2string_nid == -1)
@@ -280,7 +274,7 @@ X509_ATTRIBUTE *add_seq2string(PKCS7_SIGNER_INFO *si, char *str1, char *str2) 
	}



/* For this case, I will malloc the return strings */

int sk_get_seq2string(STACK *sk, char **str1, char **str2)

int sk_get_seq2string(STACK_OF(X509_ATTRIBUTE) *sk, char **str1, char **str2)

	{

	ASN1_TYPE *so;

	PKCS7_SIGNER_INFO si;