xnu-2782.30.5.tar.gz

[apple/xnu.git] / bsd / netinet6 / esp_output.c

diff --git a/bsd/netinet6/esp_output.c b/bsd/netinet6/esp_output.c
index 8d16d2c623b0a024c8c6a79de57992ba933b6d0c..9f6c0e0f0cbe0dbee378120e718a99d8c1f9997c 100644 (file)
--- a/bsd/netinet6/esp_output.c
+++ b/bsd/netinet6/esp_output.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2008-2011 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -457,7 +457,7 @@ esp_output(m, nexthdrp, md, af, sav)
                m->m_pkthdr.len += esphlen;
                if (udp_encapsulate) {
                        udp = mtod(n, struct udphdr *);
-                       esp = (struct esp *)((caddr_t)udp + sizeof(struct udphdr));
+                       esp = (struct esp *)(void *)((caddr_t)udp + sizeof(struct udphdr));
                } else {
                        esp = mtod(n, struct esp *);
                }
@@ -468,7 +468,7 @@ esp_output(m, nexthdrp, md, af, sav)
                esp = mtod(md, struct esp *);
                if (udp_encapsulate) {
                        udp = mtod(md, struct udphdr *);
-                       esp = (struct esp *)((caddr_t)udp + sizeof(struct udphdr));
+                       esp = (struct esp *)(void *)((caddr_t)udp + sizeof(struct udphdr));
                } else {
                        esp = mtod(md, struct esp *);
                }
@@ -726,7 +726,7 @@ esp_output(m, nexthdrp, md, af, sav)
 
     {
                const struct ah_algorithm *aalgo;
-               u_char authbuf[AH_MAXSUMSIZE];
+               u_char authbuf[AH_MAXSUMSIZE] __attribute__((aligned(4)));
                u_char *p;
                size_t siz;
        #if INET