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/bf/bf_enc.c | |
| parent | 12867252827c8efaa8ddd1fa3b3d6e321e2bcdef (diff) | |
| download | openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.gz openbsd-38ce604e3cc97706b876b0525ddff0121115456d.tar.bz2 openbsd-38ce604e3cc97706b876b0525ddff0121115456d.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/bf/bf_enc.c')
| -rw-r--r-- | src/lib/libcrypto/bf/bf_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/bf/bf_enc.c b/src/lib/libcrypto/bf/bf_enc.c index b380acf959..2d21d09f42 100644 --- a/src/lib/libcrypto/bf/bf_enc.c +++ b/src/lib/libcrypto/bf/bf_enc.c | |||
| @@ -73,7 +73,7 @@ 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 | register BF_LONG l,r; |
| 76 | const register BF_LONG *p,*s; | 76 | register 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]); |
| @@ -150,7 +150,7 @@ 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 | register BF_LONG l,r; |
| 153 | const register BF_LONG *p,*s; | 153 | register 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]); |