diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-05 15:34:35 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-07-05 15:34:35 +0200 |
| commit | 3b76e79f14e279a6526809e630e45e4f760d77de (patch) | |
| tree | bb479b57c7ad1362f05a0532a7133c0c5232dfeb /package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c | |
| parent | 9bfe4f2061f377306619fa479bc0e7adafb22125 (diff) | |
| parent | 1879491b2b6e799b20ac06d1b510726eb200944f (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c')
| -rw-r--r-- | package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c b/package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c new file mode 100644 index 000000000..8b3594525 --- /dev/null +++ b/package/grub/patches/patch-lib_libgcrypt-grub_cipher_camellia_c @@ -0,0 +1,29 @@ +--- grub-1.98.orig/lib/libgcrypt-grub/cipher/camellia.c 2010-03-06 21:52:26.000000000 +0100 ++++ grub-1.98/lib/libgcrypt-grub/cipher/camellia.c 2010-06-26 20:49:20.915278106 +0200 +@@ -26,6 +26,7 @@ + */ + + ++#include <grub/misc.h> + #include "camellia.h" + + /* u32 must be 32bit word */ +@@ -946,13 +947,13 @@ void camellia_setup192(const unsigned ch + unsigned char kk[32]; + u32 krll, krlr, krrl,krrr; + +- memcpy(kk, key, 24); +- memcpy((unsigned char *)&krll, key+16,4); +- memcpy((unsigned char *)&krlr, key+20,4); ++ grub_memcpy(kk, key, 24); ++ grub_memcpy((unsigned char *)&krll, key+16,4); ++ grub_memcpy((unsigned char *)&krlr, key+20,4); + krrl = ~krll; + krrr = ~krlr; +- memcpy(kk+24, (unsigned char *)&krrl, 4); +- memcpy(kk+28, (unsigned char *)&krrr, 4); ++ grub_memcpy(kk+24, (unsigned char *)&krrl, 4); ++ grub_memcpy(kk+28, (unsigned char *)&krrr, 4); + camellia_setup256(kk, subkey); + return; + } |