summaryrefslogtreecommitdiffstats
path: root/crypto/libdes/cfb64enc.c
diff options
context:
space:
mode:
Diffstat (limited to 'crypto/libdes/cfb64enc.c')
-rw-r--r--crypto/libdes/cfb64enc.c39
1 files changed, 16 insertions, 23 deletions
diff --git a/crypto/libdes/cfb64enc.c b/crypto/libdes/cfb64enc.c
index 66c944a..389a232 100644
--- a/crypto/libdes/cfb64enc.c
+++ b/crypto/libdes/cfb64enc.c
@@ -1,9 +1,9 @@
/* crypto/des/cfb64enc.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
- * by Eric Young (eay@mincom.oz.au).
+ * by Eric Young (eay@cryptsoft.com).
* The implementation was written so as to conform with Netscapes SSL.
*
* This library is free for commercial and non-commercial use as long as
@@ -11,7 +11,7 @@
* apply to all code found in this distribution, be it the RC4, RSA,
* lhash, DES, etc., code; not just the SSL code. The SSL documentation
* included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@mincom.oz.au).
+ * except that the holder is Tim Hudson (tjh@cryptsoft.com).
*
* Copyright remains Eric Young's, and as such any Copyright notices in
* the code are not to be removed.
@@ -31,12 +31,12 @@
* 3. All advertising materials mentioning features or use of this software
* must display the following acknowledgement:
* "This product includes cryptographic software written by
- * Eric Young (eay@mincom.oz.au)"
+ * Eric Young (eay@cryptsoft.com)"
* The word 'cryptographic' can be left out if the rouines from the library
* being used are not cryptographic related :-).
* 4. If you include any Windows specific code (or a derivative thereof) from
* the apps directory (application code) you must include an acknowledgement:
- * "This product includes software written by Tim Hudson (tjh@mincom.oz.au)"
+ * "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
*
* THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
@@ -63,14 +63,9 @@
* 64bit block we have used is contained in *num;
*/
-void des_cfb64_encrypt(in, out, length, schedule, ivec, num, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-des_key_schedule schedule;
-des_cblock (*ivec);
-int *num;
-int encrypt;
+void des_cfb64_encrypt(const unsigned char *in, unsigned char *out,
+ long length, des_key_schedule schedule, des_cblock *ivec,
+ int *num, int enc)
{
register DES_LONG v0,v1;
register long l=length;
@@ -78,8 +73,8 @@ int encrypt;
DES_LONG ti[2];
unsigned char *iv,c,cc;
- iv=(unsigned char *)ivec;
- if (encrypt)
+ iv = &(*ivec)[0];
+ if (enc)
{
while (l--)
{
@@ -87,12 +82,11 @@ int encrypt;
{
c2l(iv,v0); ti[0]=v0;
c2l(iv,v1); ti[1]=v1;
- des_encrypt((DES_LONG *)ti,
- schedule,DES_ENCRYPT);
- iv=(unsigned char *)ivec;
+ des_encrypt(ti,schedule,DES_ENCRYPT);
+ iv = &(*ivec)[0];
v0=ti[0]; l2c(v0,iv);
v0=ti[1]; l2c(v0,iv);
- iv=(unsigned char *)ivec;
+ iv = &(*ivec)[0];
}
c= *(in++)^iv[n];
*(out++)=c;
@@ -108,12 +102,11 @@ int encrypt;
{
c2l(iv,v0); ti[0]=v0;
c2l(iv,v1); ti[1]=v1;
- des_encrypt((DES_LONG *)ti,
- schedule,DES_ENCRYPT);
- iv=(unsigned char *)ivec;
+ des_encrypt(ti,schedule,DES_ENCRYPT);
+ iv = &(*ivec)[0];
v0=ti[0]; l2c(v0,iv);
v0=ti[1]; l2c(v0,iv);
- iv=(unsigned char *)ivec;
+ iv = &(*ivec)[0];
}
cc= *(in++);
c=iv[n];
OpenPOWER on IntegriCloud