vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* include/grub/crypto.h: Don't discard const attribute.

Browse source
This commit is contained in:
Vladimir Serbinenko 2013-12-21 13:36:42 +01:00
parent 17b4355943
commit d88ae4f0a4
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-21 Vladimir Serbinenko <phcoder@gmail.com>
* include/grub/crypto.h: Don't discard const attribute.
2013-12-21 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-21 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/net/bootp.c (grub_cmd_dhcpopt): Use snprintf where it * grub-core/net/bootp.c (grub_cmd_dhcpopt): Use snprintf where it

8
include/grub/crypto.h
View file

@ -293,9 +293,9 @@ grub_crypto_xor (void *out, const void *in1, const void *in2, grub_size_t size)
} }
while (size >= sizeof (grub_uint64_t)) while (size >= sizeof (grub_uint64_t))
{ {
*(grub_uint64_t *) (void *) outptr *(grub_uint64_t *) outptr
= (*(grub_uint64_t *) (void *) in1ptr = (*(const grub_uint64_t *) in1ptr
^ *(grub_uint64_t *) (void *) in2ptr); ^ *(const grub_uint64_t *) in2ptr);
in1ptr += sizeof (grub_uint64_t); in1ptr += sizeof (grub_uint64_t);
in2ptr += sizeof (grub_uint64_t); in2ptr += sizeof (grub_uint64_t);
outptr += sizeof (grub_uint64_t); outptr += sizeof (grub_uint64_t);
@ -320,7 +320,7 @@ grub_crypto_ecb_encrypt (grub_crypto_cipher_handle_t cipher,
void *out, const void *in, grub_size_t size); void *out, const void *in, grub_size_t size);
gcry_err_code_t gcry_err_code_t
grub_crypto_cbc_encrypt (grub_crypto_cipher_handle_t cipher, grub_crypto_cbc_encrypt (grub_crypto_cipher_handle_t cipher,
void *out, void *in, grub_size_t size, void *out, const void *in, grub_size_t size,
void *iv_in); void *iv_in);
gcry_err_code_t gcry_err_code_t
grub_crypto_cbc_decrypt (grub_crypto_cipher_handle_t cipher, grub_crypto_cbc_decrypt (grub_crypto_cipher_handle_t cipher,