Commit eb90a483 authored by Ben Laurie's avatar Ben Laurie
Browse files

Add functions to add certs to stacks, used for CA file/path stuff in servers.

parent 49bc2624

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -5,6 +5,14 @@ 


 Changes between 0.9.1c and 0.9.2



  *) Add new certificate file to stack functions, SSL_add_cert_file_to_stack()

     and SSL_add_cert_dir_to_stack(). These largely supplant

     SSL_load_client_CA_file(), and can be used to add multiple certs easily to

     a stack (usually this is then handed to SSL_CTX_set_client_CA_list()).

     This means that Apache-SSL and similar packages don't have to mess around

     to add as many CAs as they want to the preferred list.

     [Ben Laurie]



  *) Experiment with doxygen documentation. Currently only partially applied to

     ssl/ssl_lib.c.

     See http://www.stack.nl/~dimitri/doxygen/index.html, and run doxygen with

crypto/bio/bio.h

+3 −1
Original line number Diff line number Diff line
@@ -383,8 +383,10 @@ int BIO_get_ex_new_index(long argl, char *argp, int (*new_func)(), 
#define BIO_seek(b,ofs)	(int)BIO_ctrl(b,BIO_C_FILE_SEEK,ofs,NULL)

#define BIO_tell(b)	(int)BIO_ctrl(b,BIO_C_FILE_TELL,0,NULL)



/* name is cast to lose const, but might be better to route through a function

   so we can do it safely */

#define BIO_read_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \

		BIO_CLOSE|BIO_FP_READ,name)

		BIO_CLOSE|BIO_FP_READ,(char *)name)

#define BIO_write_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \

		BIO_CLOSE|BIO_FP_WRITE,name)

#define BIO_append_filename(b,name) BIO_ctrl(b,BIO_C_SET_FILENAME, \

crypto/stack/stack.c

+5 −1
Original line number Diff line number Diff line
@@ -82,13 +82,17 @@ char *STACK_version="Stack part of OpenSSL 0.9.2 31-Dec-1998"; 


#include <errno.h>



void sk_set_cmp_func(sk,c)

int (*sk_set_cmp_func(sk,c))()

STACK *sk;

int (*c)();

	{

	int (*old)()=sk->comp;



	if (sk->comp != c)

		sk->sorted=0;

	sk->comp=c;



	return old;

	}



STACK *sk_dup(sk)

crypto/stack/stack.h

+2 −2
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ int sk_unshift(STACK *st,char *data); 
char *sk_shift(STACK *st);

char *sk_pop(STACK *st);

void sk_zero(STACK *st);

void sk_set_cmp_func(STACK *sk, int (*c)());

int (*sk_set_cmp_func(STACK *sk, int (*c)()))();

STACK *sk_dup(STACK *st);



#else
@@ -108,7 +108,7 @@ int sk_unshift(); 
char *sk_shift();

char *sk_pop();

void sk_zero();

void sk_set_cmp_func();

int (*sk_set_cmp_func())();

STACK *sk_dup();



#endif

openssl.doxy

+1 −1
Original line number Diff line number Diff line 
PROJECT_NAME=OpenSSL

GENERATE_LATEX=no

OUTPUT_DIRECTORY=doxygen

INPUT=ssl

INPUT=ssl include

FILE_PATTERNS=*.c *.h

RECURSIVE=yes

PREDEFINED=DOXYGEN