projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly own the duplicated string
[openssl.git]
/
crypto
/
bio
/
bss_sock.c
diff --git
a/crypto/bio/bss_sock.c
b/crypto/bio/bss_sock.c
index 428c514e31d216f52bc765dc9864fd2fced7d090..c1f76a24a799533fcb5711a5b1245466b25ac6ae 100644
(file)
--- a/
crypto/bio/bss_sock.c
+++ b/
crypto/bio/bss_sock.c
@@
-58,6
+58,7
@@
#include <stdio.h>
#include <errno.h>
#define USE_SOCKETS
#include <stdio.h>
#include <errno.h>
#define USE_SOCKETS
+#include "bio_lcl.h"
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_SOCK
#include "internal/cryptlib.h"
#ifndef OPENSSL_NO_SOCK
@@
-78,7
+79,7
@@
static int sock_new(BIO *h);
static int sock_free(BIO *data);
int BIO_sock_should_retry(int s);
static int sock_free(BIO *data);
int BIO_sock_should_retry(int s);
-static BIO_METHOD methods_sockp = {
+static
const
BIO_METHOD methods_sockp = {
BIO_TYPE_SOCKET,
"socket",
sock_write,
BIO_TYPE_SOCKET,
"socket",
sock_write,
@@
-91,7
+92,7
@@
static BIO_METHOD methods_sockp = {
NULL,
};
NULL,
};
-BIO_METHOD *BIO_s_socket(void)
+
const
BIO_METHOD *BIO_s_socket(void)
{
return (&methods_sockp);
}
{
return (&methods_sockp);
}
@@
-222,7
+223,7
@@
int BIO_sock_should_retry(int i)
int BIO_sock_non_fatal_error(int err)
{
switch (err) {
int BIO_sock_non_fatal_error(int err)
{
switch (err) {
-# if defined(OPENSSL_SYS_WINDOWS)
|| defined(OPENSSL_SYS_NETWARE)
+# if defined(OPENSSL_SYS_WINDOWS)
# if defined(WSAEWOULDBLOCK)
case WSAEWOULDBLOCK:
# endif
# if defined(WSAEWOULDBLOCK)
case WSAEWOULDBLOCK:
# endif