diff options
| author | ume <ume@FreeBSD.org> | 2002-03-05 09:19:02 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2002-03-05 09:19:02 +0000 |
| commit | 92361f6aadf0c42e4292208de34b080d7479303c (patch) | |
| tree | f180dd9b96cf2c86471621a490166f4833fd61e2 /sys/crypto/blowfish/bf_skey.c | |
| parent | 1fd266f1df3466b293c974072664403373c2e7da (diff) | |
| download | FreeBSD-src-92361f6aadf0c42e4292208de34b080d7479303c.zip FreeBSD-src-92361f6aadf0c42e4292208de34b080d7479303c.tar.gz | |
- Speedup 3DES by using assembly code for i386.
- Sync des/blowfish to more recent openssl.
Obtained from: KAME/NetBSD
MFC after: 2 weeks
Diffstat (limited to 'sys/crypto/blowfish/bf_skey.c')
| -rw-r--r-- | sys/crypto/blowfish/bf_skey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/crypto/blowfish/bf_skey.c b/sys/crypto/blowfish/bf_skey.c index 4bbe036..a93558c 100644 --- a/sys/crypto/blowfish/bf_skey.c +++ b/sys/crypto/blowfish/bf_skey.c @@ -1,5 +1,5 @@ /* $FreeBSD$ */ -/* $KAME: bf_skey.c,v 1.5 2000/11/06 13:58:08 itojun Exp $ */ +/* $KAME: bf_skey.c,v 1.7 2002/02/27 01:33:59 itojun Exp $ */ /* crypto/bf/bf_skey.c */ /* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au) @@ -76,7 +76,7 @@ BF_set_key(key, len, data) BF_LONG *p, ri, in[2]; unsigned char *d, *end; - memcpy((char *)key, (char *)&bf_init, sizeof(BF_KEY)); + memcpy((char *)key, (const char *)&bf_init, sizeof(BF_KEY)); p = key->P; if (len > ((BF_ROUNDS + 2) * 4)) @@ -106,14 +106,14 @@ BF_set_key(key, len, data) in[0] = 0L; in[1] = 0L; for (i = 0; i < BF_ROUNDS + 2; i += 2) { - BF_encrypt(in, key, BF_ENCRYPT); + BF_encrypt(in, key); p[i ] = in[0]; p[i+1] = in[1]; } p = key->S; for (i = 0; i < 4 * 256; i += 2) { - BF_encrypt(in, key, BF_ENCRYPT); + BF_encrypt(in, key); p[i ] = in[0]; p[i+1] = in[1]; } |
