projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
There's really no need to use $ENV::HOME
[openssl.git]
/
crypto
/
des
/
fcrypt_b.c
diff --git
a/crypto/des/fcrypt_b.c
b/crypto/des/fcrypt_b.c
index f929b66cfb80930c3e72d1aa5e600409e5493fb1..8822816938ddddfc2cdf6f2f341959f0e55978c8 100644
(file)
--- a/
crypto/des/fcrypt_b.c
+++ b/
crypto/des/fcrypt_b.c
@@
-1,5
+1,5
@@
/* crypto/des/fcrypt_b.c */
/* crypto/des/fcrypt_b.c */
-/* Copyright (C) 1995-199
7
Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-199
8
Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
* This package is an SSL implementation written
* All rights reserved.
*
* This package is an SSL implementation written
@@
-58,7
+58,7
@@
#include <stdio.h>
#include <stdio.h>
-/* This version of crypt has been developed from my MIT compat
a
ble
+/* This version of crypt has been developed from my MIT compat
i
ble
* DES library.
* The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
* Eric Young (eay@cryptsoft.com)
* DES library.
* The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
* Eric Young (eay@cryptsoft.com)
@@
-77,15
+77,12
@@
#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
(a)=(a)^(t)^(t>>(16-(n))))\
#define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
(a)=(a)^(t)^(t>>(16-(n))))\
-void fcrypt_body(out, ks, Eswap0, Eswap1)
-DES_LONG *out;
-des_key_schedule ks;
-DES_LONG Eswap0;
-DES_LONG Eswap1;
+void fcrypt_body(DES_LONG *out, DES_key_schedule *ks, DES_LONG Eswap0,
+ DES_LONG Eswap1)
{
register DES_LONG l,r,t,u;
#ifdef DES_PTR
{
register DES_LONG l,r,t,u;
#ifdef DES_PTR
- register
unsigned char *des_SP=(unsigned char *)des
_SPtrans;
+ register
const unsigned char *des_SP=(const unsigned char *)DES
_SPtrans;
#endif
register DES_LONG *s;
register int j;
#endif
register DES_LONG *s;
register int j;
@@
-100,15
+97,13
@@
DES_LONG Eswap1;
for (j=0; j<25; j++)
{
for (j=0; j<25; j++)
{
-#ifdef DES_UNROLL
+#if
n
def DES_UNROLL
register int i;
register int i;
- for (i=0; i<32; i+=
8
)
+ for (i=0; i<32; i+=
4
)
{
D_ENCRYPT(l,r,i+0); /* 1 */
D_ENCRYPT(r,l,i+2); /* 2 */
{
D_ENCRYPT(l,r,i+0); /* 1 */
D_ENCRYPT(r,l,i+2); /* 2 */
- D_ENCRYPT(l,r,i+4); /* 1 */
- D_ENCRYPT(r,l,i+6); /* 2 */
}
#else
D_ENCRYPT(l,r, 0); /* 1 */
}
#else
D_ENCRYPT(l,r, 0); /* 1 */