projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
install-reloc: Support multi-binary installation.
[gnulib.git]
/
lib
/
arcfour.c
diff --git
a/lib/arcfour.c
b/lib/arcfour.c
index
95f8204
..
39890b9
100644
(file)
--- a/
lib/arcfour.c
+++ b/
lib/arcfour.c
@@
-1,6
+1,5
@@
/* arcfour.c --- The arcfour stream cipher
/* arcfour.c --- The arcfour stream cipher
- * Copyright (C) 2000, 2001, 2002, 2003, 2005, 2006 Free Software
- * Foundation, Inc.
+ * Copyright (C) 2000-2003, 2005-2006, 2009-2013 Free Software Foundation, Inc.
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
*
* This file is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published
@@
-13,9
+12,7
@@
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this file; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
+ * along with this file; if not, see <http://www.gnu.org/licenses/>.
*
*/
*
*/
@@
-33,7
+30,7
@@
void
arcfour_stream (arcfour_context * context, const char *inbuf, char *outbuf,
void
arcfour_stream (arcfour_context * context, const char *inbuf, char *outbuf,
- size_t length)
+
size_t length)
{
uint8_t i = context->idx_i;
uint8_t j = context->idx_j;
{
uint8_t i = context->idx_i;
uint8_t j = context->idx_j;
@@
-49,7
+46,7
@@
arcfour_stream (arcfour_context * context, const char *inbuf, char *outbuf,
sbox[i] = sbox[j];
sbox[j] = t;
*outbuf++ = (*inbuf++
sbox[i] = sbox[j];
sbox[j] = t;
*outbuf++ = (*inbuf++
- ^ sbox[(0U + sbox[i] + sbox[j]) % ARCFOUR_SBOX_SIZE]);
+
^ sbox[(0U + sbox[i] + sbox[j]) % ARCFOUR_SBOX_SIZE]);
}
context->idx_i = i;
}
context->idx_i = i;
@@
-73,6
+70,6
@@
arcfour_setkey (arcfour_context * context, const char *key, size_t keylen)
sbox[i] = sbox[j];
sbox[j] = t;
if (++k == keylen)
sbox[i] = sbox[j];
sbox[j] = t;
if (++k == keylen)
- k = 0;
+
k = 0;
}
}
}
}