projects
/
project
/
ustream-ssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
87dcf54
)
fix compile errors on linux
author
Felix Fietkau
<nbd@openwrt.org>
Fri, 4 Jan 2013 22:17:35 +0000
(23:17 +0100)
committer
Felix Fietkau
<nbd@openwrt.org>
Sun, 13 Jan 2013 08:41:32 +0000
(09:41 +0100)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
ustream-example.c
patch
|
blob
|
history
ustream-ssl.c
patch
|
blob
|
history
diff --git
a/ustream-example.c
b/ustream-example.c
index
b3cbe76
..
ea22067
100644
(file)
--- a/
ustream-example.c
+++ b/
ustream-example.c
@@
-5,6
+5,7
@@
#include <getopt.h>
#include <stdlib.h>
#include <string.h>
+#include <unistd.h>
#include <libubox/ustream.h>
#include <libubox/uloop.h>
diff --git
a/ustream-ssl.c
b/ustream-ssl.c
index
ce32eb5
..
afb01f3
100644
(file)
--- a/
ustream-ssl.c
+++ b/
ustream-ssl.c
@@
-182,12
+182,8
@@
static void ustream_ssl_stream_init(struct ustream_ssl *us)
static void *_ustream_ssl_context_new(bool server)
{
-#ifdef CYASSL_OPENSSL_H_
- SSL_METHOD *m;
-#else
- const SSL_METHOD *m;
-#endif
SSL_CTX *c;
+ const void *m;
ssl_init();
@@
-203,7
+199,7
@@
static void *_ustream_ssl_context_new(bool server)
m = TLSv1_client_method();
#endif
- c = SSL_CTX_new(m);
+ c = SSL_CTX_new(
(void *)
m);
if (!c)
return NULL;