diff options
| author | djm <> | 2008-09-06 12:17:54 +0000 |
|---|---|---|
| committer | djm <> | 2008-09-06 12:17:54 +0000 |
| commit | 38ce604e3cc97706b876b0525ddff0121115456d (patch) | |
| tree | 7ccc28afe1789ea3dbedf72365f955d5b8e105b5 /src/lib/libcrypto/des/cfb64ede.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/des/cfb64ede.c')
| -rw-r--r-- | src/lib/libcrypto/des/cfb64ede.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/des/cfb64ede.c b/src/lib/libcrypto/des/cfb64ede.c index f3c6018528..de34ecceb9 100644 --- a/src/lib/libcrypto/des/cfb64ede.c +++ b/src/lib/libcrypto/des/cfb64ede.c | |||
| @@ -152,8 +152,8 @@ void DES_ede3_cfb_encrypt(const unsigned char *in,unsigned char *out, | |||
| 152 | DES_cblock *ivec,int enc) | 152 | DES_cblock *ivec,int enc) |
| 153 | { | 153 | { |
| 154 | register DES_LONG d0,d1,v0,v1; | 154 | register DES_LONG d0,d1,v0,v1; |
| 155 | register long l=length; | 155 | register unsigned long l=length,n=((unsigned int)numbits+7)/8; |
| 156 | register int num=numbits,n=(numbits+7)/8,i; | 156 | register int num=numbits,i; |
| 157 | DES_LONG ti[2]; | 157 | DES_LONG ti[2]; |
| 158 | unsigned char *iv; | 158 | unsigned char *iv; |
| 159 | unsigned char ovec[16]; | 159 | unsigned char ovec[16]; |