diff options
| author | beck <> | 2002-05-15 02:29:21 +0000 |
|---|---|---|
| committer | beck <> | 2002-05-15 02:29:21 +0000 |
| commit | b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9 (patch) | |
| tree | fa27cf82a1250b64ed3bf5f4a18c7354d470bbcc /src/lib/libcrypto/des/rpc_enc.c | |
| parent | e471e1ea98d673597b182ea85f29e30c97cd08b5 (diff) | |
| download | openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.gz openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.tar.bz2 openbsd-b64270d1e45fe7f3241e4c9b6ce60d5ac89bc2e9.zip | |
OpenSSL 0.9.7 stable 2002 05 08 merge
Diffstat (limited to 'src/lib/libcrypto/des/rpc_enc.c')
| -rw-r--r-- | src/lib/libcrypto/des/rpc_enc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/libcrypto/des/rpc_enc.c b/src/lib/libcrypto/des/rpc_enc.c index 32d96d5cae..d937d08da5 100644 --- a/src/lib/libcrypto/des/rpc_enc.c +++ b/src/lib/libcrypto/des/rpc_enc.c | |||
| @@ -63,20 +63,20 @@ | |||
| 63 | int _des_crypt(char *buf,int len,struct desparams *desp); | 63 | int _des_crypt(char *buf,int len,struct desparams *desp); |
| 64 | int _des_crypt(char *buf, int len, struct desparams *desp) | 64 | int _des_crypt(char *buf, int len, struct desparams *desp) |
| 65 | { | 65 | { |
| 66 | des_key_schedule ks; | 66 | DES_key_schedule ks; |
| 67 | int enc; | 67 | int enc; |
| 68 | 68 | ||
| 69 | des_set_key_unchecked(&desp->des_key,ks); | 69 | DES_set_key_unchecked(&desp->des_key,&ks); |
| 70 | enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT; | 70 | enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT; |
| 71 | 71 | ||
| 72 | if (desp->des_mode == CBC) | 72 | if (desp->des_mode == CBC) |
| 73 | des_ecb_encrypt((const_des_cblock *)desp->UDES.UDES_buf, | 73 | DES_ecb_encrypt((const_DES_cblock *)desp->UDES.UDES_buf, |
| 74 | (des_cblock *)desp->UDES.UDES_buf,ks, | 74 | (DES_cblock *)desp->UDES.UDES_buf,&ks, |
| 75 | enc); | 75 | enc); |
| 76 | else | 76 | else |
| 77 | { | 77 | { |
| 78 | des_ncbc_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf, | 78 | DES_ncbc_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf, |
| 79 | len,ks,&desp->des_ivec,enc); | 79 | len,&ks,&desp->des_ivec,enc); |
| 80 | #ifdef undef | 80 | #ifdef undef |
| 81 | /* len will always be %8 if called from common_crypt | 81 | /* len will always be %8 if called from common_crypt |
| 82 | * in secure_rpc. | 82 | * in secure_rpc. |