projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Raise default crypto algorithms to AES256 and SHA256.
[tinc]
/
lib
/
dropin.c
diff --git
a/lib/dropin.c
b/lib/dropin.c
index
f0c0232
..
f6eda42
100644
(file)
--- a/
lib/dropin.c
+++ b/
lib/dropin.c
@@
-1,7
+1,7
@@
/*
dropin.c -- a set of drop-in replacements for libc functions
/*
dropin.c -- a set of drop-in replacements for libc functions
- Copyright (C) 2000-200
4 Ivo Timmermans <ivo@tinc-vpn.org>
,
- 2000-200
4
Guus Sliepen <guus@tinc-vpn.org>
+ Copyright (C) 2000-200
5 Ivo Timmermans
,
+ 2000-200
6
Guus Sliepen <guus@tinc-vpn.org>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-125,27
+125,36
@@
char *get_current_dir_name(void)
#endif
#ifndef HAVE_ASPRINTF
#endif
#ifndef HAVE_ASPRINTF
-int asprintf(char **buf, const char *fmt, ...)
+int asprintf(char **buf, const char *fmt, ...) {
+ int result;
+ va_list ap;
+ va_start(ap, fmt);
+ result = vasprintf(buf, fmt, ap);
+ va_end(ap);
+ return result;
+}
+
+int vasprintf(char **buf, const char *fmt, va_list ap) {
{
int status;
{
int status;
- va_list a
p
;
+ va_list a
q
;
int len;
len = 4096;
*buf = xmalloc(len);
int len;
len = 4096;
*buf = xmalloc(len);
- va_
start(ap, fmt
);
- status = vsnprintf(*buf, len, fmt, a
p
);
- va_end(a
p
);
+ va_
copy(aq, ap
);
+ status = vsnprintf(*buf, len, fmt, a
q
);
+ va_end(a
q
);
if(status >= 0)
*buf = xrealloc(*buf, status + 1);
if(status > len - 1) {
len = status;
if(status >= 0)
*buf = xrealloc(*buf, status + 1);
if(status > len - 1) {
len = status;
- va_
start(ap, fmt
);
- status = vsnprintf(*buf, len, fmt, a
p
);
- va_end(a
p
);
+ va_
copy(aq, ap
);
+ status = vsnprintf(*buf, len, fmt, a
q
);
+ va_end(a
q
);
}
return status;
}
return status;
@@
-159,15
+168,3
@@
int gettimeofday(struct timeval *tv, void *tz) {
return 0;
}
#endif
return 0;
}
#endif
-
-#ifndef HAVE_RANDOM
-#include <openssl/rand.h>
-
-long int random(void) {
- long int x;
-
- RAND_pseudo_bytes((unsigned char *)&x, sizeof(x));
-
- return x;
-}
-#endif