mirror/openssl
2
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-11-21 01:15:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for BIO pairs.

Browse Source
This commit is contained in:
Bodo Möller 1999-06-07 22:51:55 +00:00
parent ba9f280885
commit 1aad3392e5
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/bio/bio.h
View File

@ -512,6 +512,14 @@ int BIO_fd_non_fatal_error(int error);
int BIO_dump(BIO *b,const char *bytes,int len); int BIO_dump(BIO *b,const char *bytes,int len);
struct hostent *BIO_gethostbyname(const char *name); struct hostent *BIO_gethostbyname(const char *name);
/* We might want a thread-safe interface too:
* struct hostent *BIO_gethostbyname_r(const char *name,
* struct hostent *result, void *buffer, size_t buflen);
* or something similar (caller allocates a struct hostent,
* pointed to by "result", and additional buffer space for the various
* substructures; if the buffer does not suffice, NULL is returned
* and an appropriate error code is set).
*/
int BIO_sock_error(int sock); int BIO_sock_error(int sock);
int BIO_socket_ioctl(int fd, long type, unsigned long *arg); int BIO_socket_ioctl(int fd, long type, unsigned long *arg);
int BIO_socket_nbio(int fd,int mode); int BIO_socket_nbio(int fd,int mode);

4
crypto/bio/bss_bio.c
View File

@ -198,7 +198,7 @@ static int bio_make_pair(BIO *bio1, BIO *bio2)
return 0; return 0;
} }
if (b1->buf != NULL) if (b1->buf == NULL)
{ {
b1->buf = Malloc(b1->size); b1->buf = Malloc(b1->size);
if (b1->buf == NULL) if (b1->buf == NULL)
@ -210,7 +210,7 @@ static int bio_make_pair(BIO *bio1, BIO *bio2)
b1->offset = 0; b1->offset = 0;
} }
if (b2->buf != NULL) if (b2->buf == NULL)
{ {
b2->buf = Malloc(b2->size); b2->buf = Malloc(b2->size);
if (b2->buf == NULL) if (b2->buf == NULL)

2
util/libeay.num
View File

@ -1765,3 +1765,5 @@ PKCS5_PBE_keyivgen 1789
i2d_PKCS8_bio 1790 i2d_PKCS8_bio 1790
i2d_PKCS8_PRIV_KEY_INFO_fp 1791 i2d_PKCS8_PRIV_KEY_INFO_fp 1791
i2d_PKCS8_PRIV_KEY_INFO_bio 1792 i2d_PKCS8_PRIV_KEY_INFO_bio 1792
BIO_s_bio 1793
PKCS5_pbe2_set 1794