From 0beeff9c772045434e719c2deca271ee8f73d54c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= <nisse@lysator.liu.se> Date: Wed, 24 Apr 2013 23:18:03 +0200 Subject: [PATCH] Updated memxor documentation. --- ChangeLog | 3 +++ nettle.texinfo | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f1ae79c7..9478e0c1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2013-04-24 Niels Möller <nisse@lysator.liu.se> + * nettle.texinfo (Miscellaneous functions): Updated memxor + prototype. Document memxor3. + * salsa20-crypt.c (salsa20_crypt): Deleted cast of memxor argument, no longer needed. * salsa20r12-crypt.c (salsa20r12_crypt): Likewise. diff --git a/nettle.texinfo b/nettle.texinfo index 44ee3124..688ceca5 100644 --- a/nettle.texinfo +++ b/nettle.texinfo @@ -3717,12 +3717,18 @@ error. @comment node-name, next, previous, up @section Miscellaneous functions -@deftypefun {uint8_t *} memxor (uint8_t *@var{dst}, const uint8_t *@var{src}, size_t @var{n}) +@deftypefun {void *} memxor (void *@var{dst}, const void *@var{src}, size_t @var{n}) XORs the source area on top of the destination area. The interface doesn't follow the Nettle conventions, because it is intended to be similar to the ANSI-C @code{memcpy} function. @end deftypefun +@deftypefun {void *} memxor3 (void *@var{dst}, const void *@var{a}, const void *@var{b}, size_t @var{n}) +Like @code{memxor}, but takes two source areas and separate +destination area. +@end deftypefun + + @code{memxor} is declared in @file{<nettle/memxor.h>}. @node Compatibility functions, , Miscellaneous functions, Reference -- GitLab