diff options
| author | jsg <> | 2014-10-28 07:35:59 +0000 |
|---|---|---|
| committer | jsg <> | 2014-10-28 07:35:59 +0000 |
| commit | a0b4b08aa4811ef730e76a9ffc401a5293770f92 (patch) | |
| tree | d82fff0ac0ba35d28951ab9d9e5225251c23ecda /src/lib/libcrypto/cast | |
| parent | 41c028be1988ad160ef2fa6feca4441bb4bca17d (diff) | |
| download | openbsd-a0b4b08aa4811ef730e76a9ffc401a5293770f92.tar.gz openbsd-a0b4b08aa4811ef730e76a9ffc401a5293770f92.tar.bz2 openbsd-a0b4b08aa4811ef730e76a9ffc401a5293770f92.zip | |
deregister; no binary change
ok jsing@ miod@
Diffstat (limited to 'src/lib/libcrypto/cast')
| -rw-r--r-- | src/lib/libcrypto/cast/c_cfb64.c | 8 | ||||
| -rw-r--r-- | src/lib/libcrypto/cast/c_enc.c | 16 | ||||
| -rw-r--r-- | src/lib/libcrypto/cast/c_ofb64.c | 10 |
3 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/libcrypto/cast/c_cfb64.c b/src/lib/libcrypto/cast/c_cfb64.c index 77a02d6dd8..726d19e005 100644 --- a/src/lib/libcrypto/cast/c_cfb64.c +++ b/src/lib/libcrypto/cast/c_cfb64.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: c_cfb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: c_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 | * |
| @@ -68,9 +68,9 @@ void CAST_cfb64_encrypt(const unsigned char *in, unsigned char *out, | |||
| 68 | long length, const CAST_KEY *schedule, unsigned char *ivec, | 68 | long length, const CAST_KEY *schedule, unsigned char *ivec, |
| 69 | int *num, int enc) | 69 | int *num, int enc) |
| 70 | { | 70 | { |
| 71 | register CAST_LONG v0,v1,t; | 71 | CAST_LONG v0,v1,t; |
| 72 | register int n= *num; | 72 | int n= *num; |
| 73 | register long l=length; | 73 | long l=length; |
| 74 | CAST_LONG ti[2]; | 74 | CAST_LONG ti[2]; |
| 75 | unsigned char *iv,c,cc; | 75 | unsigned char *iv,c,cc; |
| 76 | 76 | ||
diff --git a/src/lib/libcrypto/cast/c_enc.c b/src/lib/libcrypto/cast/c_enc.c index 4305c3108c..5999a59031 100644 --- a/src/lib/libcrypto/cast/c_enc.c +++ b/src/lib/libcrypto/cast/c_enc.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: c_enc.c,v 1.6 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: c_enc.c,v 1.7 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,8 +62,8 @@ | |||
| 62 | #ifndef OPENBSD_CAST_ASM | 62 | #ifndef OPENBSD_CAST_ASM |
| 63 | void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key) | 63 | void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key) |
| 64 | { | 64 | { |
| 65 | register CAST_LONG l,r,t; | 65 | CAST_LONG l,r,t; |
| 66 | register const CAST_LONG *k; | 66 | const CAST_LONG *k; |
| 67 | 67 | ||
| 68 | k= &(key->data[0]); | 68 | k= &(key->data[0]); |
| 69 | l=data[0]; | 69 | l=data[0]; |
| @@ -95,8 +95,8 @@ void CAST_encrypt(CAST_LONG *data, const CAST_KEY *key) | |||
| 95 | 95 | ||
| 96 | void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key) | 96 | void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key) |
| 97 | { | 97 | { |
| 98 | register CAST_LONG l,r,t; | 98 | CAST_LONG l,r,t; |
| 99 | register const CAST_LONG *k; | 99 | const CAST_LONG *k; |
| 100 | 100 | ||
| 101 | k= &(key->data[0]); | 101 | k= &(key->data[0]); |
| 102 | l=data[0]; | 102 | l=data[0]; |
| @@ -130,9 +130,9 @@ void CAST_decrypt(CAST_LONG *data, const CAST_KEY *key) | |||
| 130 | void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | 130 | void CAST_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, |
| 131 | const CAST_KEY *ks, unsigned char *iv, int enc) | 131 | const CAST_KEY *ks, unsigned char *iv, int enc) |
| 132 | { | 132 | { |
| 133 | register CAST_LONG tin0,tin1; | 133 | CAST_LONG tin0,tin1; |
| 134 | register CAST_LONG tout0,tout1,xor0,xor1; | 134 | CAST_LONG tout0,tout1,xor0,xor1; |
| 135 | register long l=length; | 135 | long l=length; |
| 136 | CAST_LONG tin[2]; | 136 | CAST_LONG tin[2]; |
| 137 | 137 | ||
| 138 | if (enc) | 138 | if (enc) |
diff --git a/src/lib/libcrypto/cast/c_ofb64.c b/src/lib/libcrypto/cast/c_ofb64.c index dc5eebf56b..611425a668 100644 --- a/src/lib/libcrypto/cast/c_ofb64.c +++ b/src/lib/libcrypto/cast/c_ofb64.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: c_ofb64.c,v 1.4 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: c_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 | * |
| @@ -67,11 +67,11 @@ void CAST_ofb64_encrypt(const unsigned char *in, unsigned char *out, | |||
| 67 | long length, const CAST_KEY *schedule, unsigned char *ivec, | 67 | long length, const CAST_KEY *schedule, unsigned char *ivec, |
| 68 | int *num) | 68 | int *num) |
| 69 | { | 69 | { |
| 70 | register CAST_LONG v0,v1,t; | 70 | CAST_LONG v0,v1,t; |
| 71 | register int n= *num; | 71 | int n= *num; |
| 72 | register long l=length; | 72 | long l=length; |
| 73 | unsigned char d[8]; | 73 | unsigned char d[8]; |
| 74 | register char *dp; | 74 | char *dp; |
| 75 | CAST_LONG ti[2]; | 75 | CAST_LONG ti[2]; |
| 76 | unsigned char *iv; | 76 | unsigned char *iv; |
| 77 | int save=0; | 77 | int save=0; |
