diff options
Diffstat (limited to 'src/lib/libcrypto/idea')
-rw-r--r-- | src/lib/libcrypto/idea/i_cbc.c | 12 | ||||
-rw-r--r-- | src/lib/libcrypto/idea/i_cfb64.c | 8 | ||||
-rw-r--r-- | src/lib/libcrypto/idea/i_ofb64.c | 10 | ||||
-rw-r--r-- | src/lib/libcrypto/idea/i_skey.c | 6 |
4 files changed, 18 insertions, 18 deletions
diff --git a/src/lib/libcrypto/idea/i_cbc.c b/src/lib/libcrypto/idea/i_cbc.c index 74f490d0c0..5bb9640c34 100644 --- a/src/lib/libcrypto/idea/i_cbc.c +++ b/src/lib/libcrypto/idea/i_cbc.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: i_cbc.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: i_cbc.c,v 1.3 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 idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | 62 | void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, |
63 | IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt) | 63 | IDEA_KEY_SCHEDULE *ks, unsigned char *iv, int encrypt) |
64 | { | 64 | { |
65 | register unsigned long tin0,tin1; | 65 | unsigned long tin0,tin1; |
66 | register unsigned long tout0,tout1,xor0,xor1; | 66 | unsigned long tout0,tout1,xor0,xor1; |
67 | register long l=length; | 67 | long l=length; |
68 | unsigned long tin[2]; | 68 | unsigned long tin[2]; |
69 | 69 | ||
70 | if (encrypt) | 70 | if (encrypt) |
@@ -135,8 +135,8 @@ void idea_cbc_encrypt(const unsigned char *in, unsigned char *out, long length, | |||
135 | 135 | ||
136 | void idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key) | 136 | void idea_encrypt(unsigned long *d, IDEA_KEY_SCHEDULE *key) |
137 | { | 137 | { |
138 | register IDEA_INT *p; | 138 | IDEA_INT *p; |
139 | register unsigned long x1,x2,x3,x4,t0,t1,ul; | 139 | unsigned long x1,x2,x3,x4,t0,t1,ul; |
140 | 140 | ||
141 | x2=d[0]; | 141 | x2=d[0]; |
142 | x1=(x2>>16); | 142 | x1=(x2>>16); |
diff --git a/src/lib/libcrypto/idea/i_cfb64.c b/src/lib/libcrypto/idea/i_cfb64.c index 98fdd3ed00..b979aaef86 100644 --- a/src/lib/libcrypto/idea/i_cfb64.c +++ b/src/lib/libcrypto/idea/i_cfb64.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: i_cfb64.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: i_cfb64.c,v 1.3 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 idea_cfb64_encrypt(const unsigned char *in, unsigned char *out, | |||
68 | long length, IDEA_KEY_SCHEDULE *schedule, | 68 | long length, IDEA_KEY_SCHEDULE *schedule, |
69 | unsigned char *ivec, int *num, int encrypt) | 69 | unsigned char *ivec, int *num, int encrypt) |
70 | { | 70 | { |
71 | register unsigned long v0,v1,t; | 71 | unsigned long v0,v1,t; |
72 | register int n= *num; | 72 | int n= *num; |
73 | register long l=length; | 73 | long l=length; |
74 | unsigned long ti[2]; | 74 | unsigned long ti[2]; |
75 | unsigned char *iv,c,cc; | 75 | unsigned char *iv,c,cc; |
76 | 76 | ||
diff --git a/src/lib/libcrypto/idea/i_ofb64.c b/src/lib/libcrypto/idea/i_ofb64.c index cfef8ea95f..376dad9f6d 100644 --- a/src/lib/libcrypto/idea/i_ofb64.c +++ b/src/lib/libcrypto/idea/i_ofb64.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: i_ofb64.c,v 1.2 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: i_ofb64.c,v 1.3 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 idea_ofb64_encrypt(const unsigned char *in, unsigned char *out, | |||
67 | long length, IDEA_KEY_SCHEDULE *schedule, | 67 | long length, IDEA_KEY_SCHEDULE *schedule, |
68 | unsigned char *ivec, int *num) | 68 | unsigned char *ivec, int *num) |
69 | { | 69 | { |
70 | register unsigned long v0,v1,t; | 70 | unsigned 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 | unsigned long ti[2]; | 75 | unsigned long ti[2]; |
76 | unsigned char *iv; | 76 | unsigned char *iv; |
77 | int save=0; | 77 | int save=0; |
diff --git a/src/lib/libcrypto/idea/i_skey.c b/src/lib/libcrypto/idea/i_skey.c index 8af1874598..2824d2618e 100644 --- a/src/lib/libcrypto/idea/i_skey.c +++ b/src/lib/libcrypto/idea/i_skey.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: i_skey.c,v 1.3 2014/06/12 15:49:29 deraadt Exp $ */ | 1 | /* $OpenBSD: i_skey.c,v 1.4 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 | * |
@@ -64,7 +64,7 @@ static IDEA_INT inverse(unsigned int xin); | |||
64 | void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks) | 64 | void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks) |
65 | { | 65 | { |
66 | int i; | 66 | int i; |
67 | register IDEA_INT *kt,*kf,r0,r1,r2; | 67 | IDEA_INT *kt,*kf,r0,r1,r2; |
68 | 68 | ||
69 | kt= &(ks->data[0][0]); | 69 | kt= &(ks->data[0][0]); |
70 | n2s(key,kt[0]); n2s(key,kt[1]); n2s(key,kt[2]); n2s(key,kt[3]); | 70 | n2s(key,kt[0]); n2s(key,kt[1]); n2s(key,kt[2]); n2s(key,kt[3]); |
@@ -98,7 +98,7 @@ void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks) | |||
98 | void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk) | 98 | void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk) |
99 | { | 99 | { |
100 | int r; | 100 | int r; |
101 | register IDEA_INT *fp,*tp,t; | 101 | IDEA_INT *fp,*tp,t; |
102 | 102 | ||
103 | tp= &(dk->data[0][0]); | 103 | tp= &(dk->data[0][0]); |
104 | fp= &(ek->data[8][0]); | 104 | fp= &(ek->data[8][0]); |