projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ccm128.c: initialize ctx->block (what I was smoking?).
[openssl.git]
/
crypto
/
des
/
rpc_enc.c
diff --git
a/crypto/des/rpc_enc.c
b/crypto/des/rpc_enc.c
index 51f560a84f1bf3a23eec6e9d9c6072cd0687040d..d937d08da5ff83198deb525815ca348751c0deff 100644
(file)
--- a/
crypto/des/rpc_enc.c
+++ b/
crypto/des/rpc_enc.c
@@
-60,27
+60,23
@@
#include "des_locl.h"
#include "des_ver.h"
#include "des_locl.h"
#include "des_ver.h"
-#ifndef NOPROTO
int _des_crypt(char *buf,int len,struct desparams *desp);
int _des_crypt(char *buf,int len,struct desparams *desp);
-#else
-int _des_crypt();
-#endif
-
int _des_crypt(char *buf, int len, struct desparams *desp)
{
int _des_crypt(char *buf, int len, struct desparams *desp)
{
-
des
_key_schedule ks;
+
DES
_key_schedule ks;
int enc;
int enc;
-
des_set_key(desp->des_key,
ks);
+
DES_set_key_unchecked(&desp->des_key,&
ks);
enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT;
if (desp->des_mode == CBC)
enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT;
if (desp->des_mode == CBC)
- des_ecb_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf,ks,
+ DES_ecb_encrypt((const_DES_cblock *)desp->UDES.UDES_buf,
+ (DES_cblock *)desp->UDES.UDES_buf,&ks,
enc);
else
{
enc);
else
{
-
des
_ncbc_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf,
- len,
ks,
desp->des_ivec,enc);
+
DES
_ncbc_encrypt(desp->UDES.UDES_buf,desp->UDES.UDES_buf,
+ len,
&ks,&
desp->des_ivec,enc);
#ifdef undef
/* len will always be %8 if called from common_crypt
* in secure_rpc.
#ifdef undef
/* len will always be %8 if called from common_crypt
* in secure_rpc.