diff options
author | 2017-06-30 11:25:29 +0000 | |
---|---|---|
committer | 2017-06-30 11:25:29 +0000 | |
commit | 2feb5d2a36a799a4048160a74a6d32eed43212af (patch) | |
tree | d4f801633a8d70547f9da3eeed271b50e1e132a6 /lib/libexpat/examples/elements.c | |
parent | Add missing rot13 function prototype (diff) | |
download | wireguard-openbsd-2feb5d2a36a799a4048160a74a6d32eed43212af.tar.xz wireguard-openbsd-2feb5d2a36a799a4048160a74a6d32eed43212af.zip |
Update libexpat to version 2.2.1 which has some security fixes.
- CVE-2017-9233 CVE-2016-9063 CVE-2016-5300 CVE-2016-4472 CVE-2016-0718
CVE-2015-2716 CVE-2015-1283 CVE-2012-6702 CVE-2012-0876 have been
addressed. Not all of them affect OpenBSD as we had fixes before.
- Upstream uses arc4random_buf(3) now. Delete all code for other
entropy sources to make sure to compile the correct one. Our
library already used arc4random(3) before.
- The overflow fixes in rev 1.11 and 1.12 of lib/xmlparse.c
have been commited upstream in a different way. Use the upstream
code to make maintenance easier.
- Although it should be ABI compatible, there is a new global
symbol align_limit_to_full_utf8_characters. As it is in
lib/internal.h, add a Symbols.map to restrict the export. Do not
bump the shared library version.
- Use the internal expat's siphash.h.
ports build ajacoutot@; move ahead deraadt@
Diffstat (limited to 'lib/libexpat/examples/elements.c')
-rw-r--r-- | lib/libexpat/examples/elements.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lib/libexpat/examples/elements.c b/lib/libexpat/examples/elements.c index bc04b6b1515..fe1699c50e8 100644 --- a/lib/libexpat/examples/elements.c +++ b/lib/libexpat/examples/elements.c @@ -6,11 +6,7 @@ */ #include <stdio.h> -#include "expat.h" - -#if defined(__amigaos__) && defined(__USE_INLINE__) -#include <proto/expat.h> -#endif +#include <expat.h> #ifdef XML_LARGE_SIZE #if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400 @@ -27,6 +23,8 @@ startElement(void *userData, const char *name, const char **atts) { int i; int *depthPtr = (int *)userData; + (void)atts; + for (i = 0; i < *depthPtr; i++) putchar('\t'); puts(name); @@ -37,6 +35,8 @@ static void XMLCALL endElement(void *userData, const char *name) { int *depthPtr = (int *)userData; + (void)name; + *depthPtr -= 1; } @@ -47,6 +47,9 @@ main(int argc, char *argv[]) XML_Parser parser = XML_ParserCreate(NULL); int done; int depth = 0; + (void)argc; + (void)argv; + XML_SetUserData(parser, &depth); XML_SetElementHandler(parser, startElement, endElement); do { |