diff options
| author | jsg <> | 2014-10-28 07:35:59 +0000 |
|---|---|---|
| committer | jsg <> | 2014-10-28 07:35:59 +0000 |
| commit | 0505bd63c15c82aead21cde52afbf6c41421d140 (patch) | |
| tree | d82fff0ac0ba35d28951ab9d9e5225251c23ecda /src/lib/libcrypto/bf | |
| parent | 794dcf073b734d649d7b5d30916d7a3ae919b66e (diff) | |
| download | openbsd-0505bd63c15c82aead21cde52afbf6c41421d140.tar.gz openbsd-0505bd63c15c82aead21cde52afbf6c41421d140.tar.bz2 openbsd-0505bd63c15c82aead21cde52afbf6c41421d140.zip | |
deregister; no binary change
ok jsing@ miod@
Diffstat (limited to 'src/lib/libcrypto/bf')
| -rw-r--r-- | src/lib/libcrypto/bf/bf_cbc.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_cfb64.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_enc.c | 20 | ||||
| -rw-r--r-- | src/lib/libcrypto/bf/bf_ofb64.c | 10 |
4 files changed, 23 insertions, 23 deletions
diff --git a/src/lib/libcrypto/bf/bf_cbc.c b/src/lib/libcrypto/bf/bf_cbc.c index bf8d2c5c48..6f45f9ae4c 100644 --- a/src/lib/libcrypto/bf/bf_cbc.c +++ b/src/lib/libcrypto/bf/bf_cbc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bf_cbc.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bf_cbc.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -62,9 +62,9 @@ | |||
| 62 | void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | 62 | void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, |
| 63 | const BF_KEY *schedule, unsigned char *ivec, int encrypt) | 63 | const BF_KEY *schedule, unsigned char *ivec, int encrypt) |
| 64 | { | 64 | { |
| 65 | register BF_LONG tin0,tin1; | 65 | BF_LONG tin0,tin1; |
| 66 | register BF_LONG tout0,tout1,xor0,xor1; | 66 | BF_LONG tout0,tout1,xor0,xor1; |
| 67 | register long l=length; | 67 | long l=length; |
| 68 | BF_LONG tin[2]; | 68 | BF_LONG tin[2]; |
| 69 | 69 | ||
| 70 | if (encrypt) | 70 | if (encrypt) |
diff --git a/src/lib/libcrypto/bf/bf_cfb64.c b/src/lib/libcrypto/bf/bf_cfb64.c index 4c31d70430..6cc0bb999b 100644 --- a/src/lib/libcrypto/bf/bf_cfb64.c +++ b/src/lib/libcrypto/bf/bf_cfb64.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bf_cfb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bf_cfb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -67,9 +67,9 @@ | |||
| 67 | void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, | 67 | void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length, |
| 68 | const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt) | 68 | const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt) |
| 69 | { | 69 | { |
| 70 | register BF_LONG v0,v1,t; | 70 | BF_LONG v0,v1,t; |
| 71 | register int n= *num; | 71 | int n= *num; |
| 72 | register long l=length; | 72 | long l=length; |
| 73 | BF_LONG ti[2]; | 73 | BF_LONG ti[2]; |
| 74 | unsigned char *iv,c,cc; | 74 | unsigned char *iv,c,cc; |
| 75 | 75 | ||
diff --git a/src/lib/libcrypto/bf/bf_enc.c b/src/lib/libcrypto/bf/bf_enc.c index a984139543..2cf1c86063 100644 --- a/src/lib/libcrypto/bf/bf_enc.c +++ b/src/lib/libcrypto/bf/bf_enc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bf_enc.c,v 1.5 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bf_enc.c,v 1.6 2014/10/28 07:35:58 jsg Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -72,8 +72,8 @@ to modify the code. | |||
| 72 | void BF_encrypt(BF_LONG *data, const BF_KEY *key) | 72 | void BF_encrypt(BF_LONG *data, const BF_KEY *key) |
| 73 | { | 73 | { |
| 74 | #ifndef BF_PTR2 | 74 | #ifndef BF_PTR2 |
| 75 | register BF_LONG l,r; | 75 | BF_LONG l,r; |
| 76 | register const BF_LONG *p,*s; | 76 | const BF_LONG *p,*s; |
| 77 | 77 | ||
| 78 | p=key->P; | 78 | p=key->P; |
| 79 | s= &(key->S[0]); | 79 | s= &(key->S[0]); |
| @@ -108,7 +108,7 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key) | |||
| 108 | data[1]=l&0xffffffffL; | 108 | data[1]=l&0xffffffffL; |
| 109 | data[0]=r&0xffffffffL; | 109 | data[0]=r&0xffffffffL; |
| 110 | #else | 110 | #else |
| 111 | register BF_LONG l,r,t,*k; | 111 | BF_LONG l,r,t,*k; |
| 112 | 112 | ||
| 113 | l=data[0]; | 113 | l=data[0]; |
| 114 | r=data[1]; | 114 | r=data[1]; |
| @@ -149,8 +149,8 @@ void BF_encrypt(BF_LONG *data, const BF_KEY *key) | |||
| 149 | void BF_decrypt(BF_LONG *data, const BF_KEY *key) | 149 | void BF_decrypt(BF_LONG *data, const BF_KEY *key) |
| 150 | { | 150 | { |
| 151 | #ifndef BF_PTR2 | 151 | #ifndef BF_PTR2 |
| 152 | register BF_LONG l,r; | 152 | BF_LONG l,r; |
| 153 | register const BF_LONG *p,*s; | 153 | const BF_LONG *p,*s; |
| 154 | 154 | ||
| 155 | p=key->P; | 155 | p=key->P; |
| 156 | s= &(key->S[0]); | 156 | s= &(key->S[0]); |
| @@ -185,7 +185,7 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key) | |||
| 185 | data[1]=l&0xffffffffL; | 185 | data[1]=l&0xffffffffL; |
| 186 | data[0]=r&0xffffffffL; | 186 | data[0]=r&0xffffffffL; |
| 187 | #else | 187 | #else |
| 188 | register BF_LONG l,r,t,*k; | 188 | BF_LONG l,r,t,*k; |
| 189 | 189 | ||
| 190 | l=data[0]; | 190 | l=data[0]; |
| 191 | r=data[1]; | 191 | r=data[1]; |
| @@ -224,9 +224,9 @@ void BF_decrypt(BF_LONG *data, const BF_KEY *key) | |||
| 224 | void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | 224 | void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, |
| 225 | const BF_KEY *schedule, unsigned char *ivec, int encrypt) | 225 | const BF_KEY *schedule, unsigned char *ivec, int encrypt) |
| 226 | { | 226 | { |
| 227 | register BF_LONG tin0,tin1; | 227 | BF_LONG tin0,tin1; |
| 228 | register BF_LONG tout0,tout1,xor0,xor1; | 228 | BF_LONG tout0,tout1,xor0,xor1; |
| 229 | register long l=length; | 229 | long l=length; |
| 230 | BF_LONG tin[2]; | 230 | BF_LONG tin[2]; |
| 231 | 231 | ||
| 232 | if (encrypt) | 232 | if (encrypt) |
diff --git a/src/lib/libcrypto/bf/bf_ofb64.c b/src/lib/libcrypto/bf/bf_ofb64.c index 6d9a55cb07..9e33162aab 100644 --- a/src/lib/libcrypto/bf/bf_ofb64.c +++ b/src/lib/libcrypto/bf/bf_ofb64.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: bf_ofb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: bf_ofb64.c,v 1.5 2014/10/28 07:35:58 jsg Exp $ */ |
| 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
| 3 | * All rights reserved. | 3 | * All rights reserved. |
| 4 | * | 4 | * |
| @@ -66,11 +66,11 @@ | |||
| 66 | void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, | 66 | void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length, |
| 67 | const BF_KEY *schedule, unsigned char *ivec, int *num) | 67 | const BF_KEY *schedule, unsigned char *ivec, int *num) |
| 68 | { | 68 | { |
| 69 | register BF_LONG v0,v1,t; | 69 | BF_LONG v0,v1,t; |
| 70 | register int n= *num; | 70 | int n= *num; |
| 71 | register long l=length; | 71 | long l=length; |
| 72 | unsigned char d[8]; | 72 | unsigned char d[8]; |
| 73 | register char *dp; | 73 | char *dp; |
| 74 | BF_LONG ti[2]; | 74 | BF_LONG ti[2]; |
| 75 | unsigned char *iv; | 75 | unsigned char *iv; |
| 76 | int save=0; | 76 | int save=0; |
