projects
/
project
/
ustream-ssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
polarssl: add mising string include
[project/ustream-ssl.git]
/
ustream-polarssl.c
diff --git
a/ustream-polarssl.c
b/ustream-polarssl.c
index e5c84557381dd5a1d56e14923bdef6c2b1dbb134..d334f15643970263a6bc79738871f18dc1df774a 100644
(file)
--- a/
ustream-polarssl.c
+++ b/
ustream-polarssl.c
@@
-20,6
+20,7
@@
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
#include <unistd.h>
#include <stdlib.h>
+#include <string.h>
#include "ustream-ssl.h"
#include "ustream-internal.h"
#include "ustream-ssl.h"
#include "ustream-internal.h"
@@
-79,7
+80,9
@@
static bool urandom_init(void)
static int _urandom(void *ctx, unsigned char *out, size_t len)
{
static int _urandom(void *ctx, unsigned char *out, size_t len)
{
- read(urandom_fd, out, len);
+ if (read(urandom_fd, out, len) < 0)
+ return POLARSSL_ERR_ENTROPY_SOURCE_FAILED;
+
return 0;
}
return 0;
}
@@
-230,17
+233,23
@@
__hidden enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us)
__hidden int __ustream_ssl_write(struct ustream_ssl *us, const char *buf, int len)
{
void *ssl = us->ssl;
__hidden int __ustream_ssl_write(struct ustream_ssl *us, const char *buf, int len)
{
void *ssl = us->ssl;
- int
ret = ssl_write(ssl, (const unsigned char *) buf, len)
;
+ int
done = 0, ret = 0
;
- if (ret < 0) {
- if (ssl_do_wait(ret))
- return 0;
+ while (done != len) {
+ ret = ssl_write(ssl, (const unsigned char *) buf + done, len - done);
- ustream_ssl_error(us, ret);
- return -1;
+ if (ret < 0) {
+ if (ssl_do_wait(ret))
+ return done;
+
+ ustream_ssl_error(us, ret);
+ return -1;
+ }
+
+ done += ret;
}
}
- return
ret
;
+ return
done
;
}
__hidden int __ustream_ssl_read(struct ustream_ssl *us, char *buf, int len)
}
__hidden int __ustream_ssl_read(struct ustream_ssl *us, char *buf, int len)