Commit 019a7aba authored by Bodo Möller's avatar Bodo Möller
Browse files

Updates. 

Prototypes and constant declarations for non-copying reads and writes for
BIO pairs (which is totally untested as of now, so I don't yet commit
the actual source code, but reserve the numbers to avoid conflicts).
parent 87c49f62

TABLE

+17 −0
Original line number Diff line number Diff line
@@ -102,6 +102,23 @@ $rc4_obj = 
$rmd160_obj   = 

$rc5_obj      = 



*** FreeBSD-elf

$cc           = gcc

$cflags       = -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall

$unistd       = 

$thread_cflag = (unknown)

$lflags       = 

$bn_ops       = BN_LLONG DES_PTR DES_RISC1 DES_UNROLL RC4_INDEX MD2_INT

$bn_obj       = asm/bn86-elf.o asm/co86-elf.o

$des_obj      = asm/dx86-elf.o asm/yx86-elf.o

$bf_obj       = asm/bx86-elf.o

$md5_obj      = asm/mx86-elf.o

$sha1_obj     = asm/sx86-elf.o

$cast_obj     = asm/cx86-elf.o

$rc4_obj      = asm/rx86-elf.o

$rmd160_obj   = asm/rm86-elf.o

$rc5_obj      = asm/r586-elf.o



*** Mingw32

$cc           = gcc

$cflags       = -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall

crypto/asn1/Makefile.ssl

+14 −11
Original line number Diff line number Diff line
@@ -160,11 +160,13 @@ a_digest.o: ../../include/openssl/err.h ../../include/openssl/evp.h 
a_digest.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

a_digest.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

a_digest.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/rc2.h

a_digest.o: ../../include/openssl/rc4.h ../../include/openssl/rc5.h

a_digest.o: ../../include/openssl/ripemd.h ../../include/openssl/rsa.h

a_digest.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h

a_digest.o: ../../include/openssl/stack.h ../cryptlib.h

a_digest.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h

a_digest.o: ../../include/openssl/rc2.h ../../include/openssl/rc4.h

a_digest.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h

a_digest.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

a_digest.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

a_digest.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

a_digest.o: ../cryptlib.h

a_dup.o: ../../include/openssl/asn1.h ../../include/openssl/asn1_mac.h

a_dup.o: ../../include/openssl/bio.h ../../include/openssl/bn.h

a_dup.o: ../../include/openssl/buffer.h ../../include/openssl/crypto.h
@@ -816,11 +818,12 @@ t_pkey.o: ../../include/openssl/stack.h ../cryptlib.h 
t_req.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

t_req.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

t_req.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

t_req.o: ../../include/openssl/crypto.h ../../include/openssl/des.h

t_req.o: ../../include/openssl/dh.h ../../include/openssl/dsa.h

t_req.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h

t_req.o: ../../include/openssl/err.h ../../include/openssl/evp.h

t_req.o: ../../include/openssl/idea.h ../../include/openssl/md2.h

t_req.o: ../../include/openssl/conf.h ../../include/openssl/crypto.h

t_req.o: ../../include/openssl/des.h ../../include/openssl/dh.h

t_req.o: ../../include/openssl/dsa.h ../../include/openssl/e_os.h

t_req.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h

t_req.o: ../../include/openssl/evp.h ../../include/openssl/idea.h

t_req.o: ../../include/openssl/lhash.h ../../include/openssl/md2.h

t_req.o: ../../include/openssl/md5.h ../../include/openssl/mdc2.h

t_req.o: ../../include/openssl/objects.h ../../include/openssl/opensslconf.h

t_req.o: ../../include/openssl/opensslv.h ../../include/openssl/pkcs7.h
@@ -829,7 +832,7 @@ t_req.o: ../../include/openssl/rc5.h ../../include/openssl/ripemd.h 
t_req.o: ../../include/openssl/rsa.h ../../include/openssl/safestack.h

t_req.o: ../../include/openssl/sha.h ../../include/openssl/stack.h

t_req.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h

t_req.o: ../cryptlib.h

t_req.o: ../../include/openssl/x509v3.h ../cryptlib.h

t_x509.o: ../../include/openssl/asn1.h ../../include/openssl/bio.h

t_x509.o: ../../include/openssl/blowfish.h ../../include/openssl/bn.h

t_x509.o: ../../include/openssl/buffer.h ../../include/openssl/cast.h

crypto/bio/bio.h

+13 −2
Original line number Diff line number Diff line
@@ -325,6 +325,10 @@ typedef struct bio_f_buffer_ctx_struct 
#define BIO_C_GET_WRITE_GUARANTEE		140

#define BIO_C_GET_READ_REQUEST			141

#define BIO_C_SHUTDOWN_WR			142

#define BIO_C_NREAD0				143

#define BIO_C_NREAD				144

#define BIO_C_NWRITE0				145

#define BIO_C_NWRITE				146





#define BIO_set_app_data(s,arg)		BIO_set_ex_data(s,0,(char *)arg)
@@ -462,8 +466,6 @@ size_t BIO_ctrl_wpending(BIO *b); 
size_t BIO_ctrl_get_write_guarantee(BIO *b);

size_t BIO_ctrl_get_read_request(BIO *b);







#ifdef NO_STDIO

#define NO_FP_API

#endif
@@ -510,6 +512,11 @@ BIO * BIO_get_retry_BIO(BIO *bio, int *reason); 
int	BIO_get_retry_reason(BIO *bio);

BIO *	BIO_dup_chain(BIO *in);



int BIO_nread0(BIO *bio, char **buf);

int BIO_nread(BIO *bio, char **buf, int num);

int BIO_nwrite0(BIO *bio, char **buf);

int BIO_nwrite(BIO *bio, char **buf, int num);



#ifndef WIN16

long BIO_debug_callback(BIO *bio,int cmd,const char *argp,int argi,

	long argl,long ret);
@@ -597,6 +604,10 @@ int BIO_printf(BIO *bio, ...); 
#define BIO_F_BIO_MAKE_PAIR				 121

#define BIO_F_BIO_NEW					 108

#define BIO_F_BIO_NEW_FILE				 109

#define BIO_F_BIO_NREAD					 123

#define BIO_F_BIO_NREAD0				 124

#define BIO_F_BIO_NWRITE				 125

#define BIO_F_BIO_NWRITE0				 122

#define BIO_F_BIO_PUTS					 110

#define BIO_F_BIO_READ					 111

#define BIO_F_BIO_SOCK_INIT				 112

crypto/bio/bio_err.c

+4 −0
Original line number Diff line number Diff line
@@ -77,6 +77,10 @@ static ERR_STRING_DATA BIO_str_functs[]= 
{ERR_PACK(0,BIO_F_BIO_MAKE_PAIR,0),	"BIO_MAKE_PAIR"},

{ERR_PACK(0,BIO_F_BIO_NEW,0),	"BIO_new"},

{ERR_PACK(0,BIO_F_BIO_NEW_FILE,0),	"BIO_new_file"},

{ERR_PACK(0,BIO_F_BIO_NREAD,0),	"BIO_nread"},

{ERR_PACK(0,BIO_F_BIO_NREAD0,0),	"BIO_nread0"},

{ERR_PACK(0,BIO_F_BIO_NWRITE,0),	"BIO_nwrite"},

{ERR_PACK(0,BIO_F_BIO_NWRITE0,0),	"BIO_nwrite0"},

{ERR_PACK(0,BIO_F_BIO_PUTS,0),	"BIO_puts"},

{ERR_PACK(0,BIO_F_BIO_READ,0),	"BIO_read"},

{ERR_PACK(0,BIO_F_BIO_SOCK_INIT,0),	"BIO_sock_init"},

util/libeay.num

+6 −0
Original line number Diff line number Diff line
@@ -1844,3 +1844,9 @@ sk_DIST_POINT_sort 1868 
RSA_check_key                           1869

OBJ_obj2txt                             1870

DSA_dup_DH                              1871

X509_REQ_get_extensions                 1872

X509_REQ_set_extension_nids             1873

BIO_nwrite                              1874

X509_REQ_extension_nid                  1875

BIO_nread                               1876

X509_REQ_get_extesion_nids              1877