Lines 3-10
Link Here
|
3 |
Use __attribute__ ((__nothrow__)) instead of the linux-ish __THROW (from the |
3 |
Use __attribute__ ((__nothrow__)) instead of the linux-ish __THROW (from the |
4 |
linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD. |
4 |
linux sys/cdefs.h) macro - should work with clang and gcc on FreeBSD. |
5 |
|
5 |
|
6 |
--- genisoimage/sha256.c.orig 2009-10-11 12:27:59.000000000 -0600 |
6 |
--- genisoimage/sha256.c.orig 2009-10-11 18:27:59 UTC |
7 |
+++ genisoimage/sha256.c 2011-10-27 14:55:25.000000000 -0600 |
7 |
+++ genisoimage/sha256.c |
8 |
@@ -24,9 +24,9 @@ |
8 |
@@ -24,9 +24,9 @@ |
9 |
|
9 |
|
10 |
/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ |
10 |
/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ |
Lines 16-24
Link Here
|
16 |
#include <sys/types.h> |
16 |
#include <sys/types.h> |
17 |
|
17 |
|
18 |
#include "sha256.h" |
18 |
#include "sha256.h" |
19 |
--- genisoimage/sha256.h.orig 2009-05-10 15:49:54.000000000 -0600 |
19 |
--- genisoimage/sha256.h.orig 2009-05-10 21:49:54 UTC |
20 |
+++ genisoimage/sha256.h 2011-10-27 14:58:30.000000000 -0600 |
20 |
+++ genisoimage/sha256.h |
21 |
@@ -42,14 +42,14 @@ |
21 |
@@ -42,14 +42,14 @@ struct sha256_ctx |
22 |
|
22 |
|
23 |
/* Initialize structure containing state of computation. |
23 |
/* Initialize structure containing state of computation. |
24 |
(FIPS 180-2: 5.3.2) */ |
24 |
(FIPS 180-2: 5.3.2) */ |
Lines 35-41
Link Here
|
35 |
|
35 |
|
36 |
/* Process the remaining bytes in the buffer and put result from CTX |
36 |
/* Process the remaining bytes in the buffer and put result from CTX |
37 |
in first 32 bytes following RESBUF. |
37 |
in first 32 bytes following RESBUF. |
38 |
@@ -57,6 +57,6 @@ |
38 |
@@ -57,6 +57,6 @@ extern void sha256_process_bytes (const |
39 |
IMPORTANT: On some systems it is required that RESBUF is correctly |
39 |
IMPORTANT: On some systems it is required that RESBUF is correctly |
40 |
aligned for a 32 bits value. */ |
40 |
aligned for a 32 bits value. */ |
41 |
extern void *sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf) |
41 |
extern void *sha256_finish_ctx (struct sha256_ctx *ctx, void *resbuf) |
Lines 43-52
Link Here
|
43 |
+ __attribute__ ((__nothrow__)); |
43 |
+ __attribute__ ((__nothrow__)); |
44 |
|
44 |
|
45 |
#endif /* sha256.h */ |
45 |
#endif /* sha256.h */ |
46 |
--- genisoimage/sha512.h.orig 2009-05-10 15:49:54.000000000 -0600 |
46 |
--- genisoimage/sha512.c.orig 2009-10-11 18:27:59 UTC |
47 |
+++ genisoimage/sha512.h 2011-10-27 14:58:35.000000000 -0600 |
47 |
+++ genisoimage/sha512.c |
48 |
@@ -42,14 +42,14 @@ |
48 |
@@ -24,9 +24,9 @@ |
49 |
|
49 |
|
|
|
50 |
/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ |
51 |
|
52 |
-#include <endian.h> |
53 |
#include <stdlib.h> |
54 |
#include <string.h> |
55 |
+#include <sys/endian.h> |
56 |
#include <sys/types.h> |
57 |
|
58 |
#include "sha512.h" |
59 |
--- genisoimage/sha512.h.orig 2009-05-10 21:49:54 UTC |
60 |
+++ genisoimage/sha512.h |
61 |
@@ -42,14 +42,14 @@ struct sha512_ctx |
62 |
|
50 |
/* Initialize structure containing state of computation. |
63 |
/* Initialize structure containing state of computation. |
51 |
(FIPS 180-2: 5.3.3) */ |
64 |
(FIPS 180-2: 5.3.3) */ |
52 |
-extern void sha512_init_ctx (struct sha512_ctx *ctx) __THROW; |
65 |
-extern void sha512_init_ctx (struct sha512_ctx *ctx) __THROW; |
Lines 62-68
Link Here
|
62 |
|
75 |
|
63 |
/* Process the remaining bytes in the buffer and put result from CTX |
76 |
/* Process the remaining bytes in the buffer and put result from CTX |
64 |
in first 64 bytes following RESBUF. |
77 |
in first 64 bytes following RESBUF. |
65 |
@@ -57,6 +57,6 @@ |
78 |
@@ -57,6 +57,6 @@ extern void sha512_process_bytes (const |
66 |
IMPORTANT: On some systems it is required that RESBUF is correctly |
79 |
IMPORTANT: On some systems it is required that RESBUF is correctly |
67 |
aligned for a 64 bits value. */ |
80 |
aligned for a 64 bits value. */ |
68 |
extern void *sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf) |
81 |
extern void *sha512_finish_ctx (struct sha512_ctx *ctx, void *resbuf) |
Lines 70-85
Link Here
|
70 |
+ __attribute__ ((__nothrow__)); |
83 |
+ __attribute__ ((__nothrow__)); |
71 |
|
84 |
|
72 |
#endif /* sha512.h */ |
85 |
#endif /* sha512.h */ |
73 |
--- genisoimage/sha512.c.orig 2009-10-11 12:27:59.000000000 -0600 |
|
|
74 |
+++ genisoimage/sha512.c 2011-10-27 14:59:01.000000000 -0600 |
75 |
@@ -24,9 +24,9 @@ |
76 |
|
77 |
/* Written by Ulrich Drepper <drepper@redhat.com>, 2007. */ |
78 |
|
79 |
-#include <endian.h> |
80 |
#include <stdlib.h> |
81 |
#include <string.h> |
82 |
+#include <sys/endian.h> |
83 |
#include <sys/types.h> |
84 |
|
85 |
#include "sha512.h" |