projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New function to add dynamic alias.
[openssl.git]
/
crypto
/
evp
/
e_idea.c
diff --git
a/crypto/evp/e_idea.c
b/crypto/evp/e_idea.c
index 66f06c06226d5822f56b2c56953fd572665b362b..48c33a774a5bac989a18921ef85a82f4c97fb4e2 100644
(file)
--- a/
crypto/evp/e_idea.c
+++ b/
crypto/evp/e_idea.c
@@
-56,10
+56,10
@@
* [including the GNU Public Licence.]
*/
* [including the GNU Public Licence.]
*/
-#ifndef OPENSSL_NO_IDEA
-
#include <stdio.h>
#include "cryptlib.h"
#include <stdio.h>
#include "cryptlib.h"
+
+#ifndef OPENSSL_NO_IDEA
#include <openssl/evp.h>
#include <openssl/objects.h>
#include "evp_locl.h"
#include <openssl/evp.h>
#include <openssl/objects.h>
#include "evp_locl.h"
@@
-88,10
+88,10
@@
typedef struct
} EVP_IDEA_KEY;
BLOCK_CIPHER_func_cbc(idea, idea, EVP_IDEA_KEY, ks)
} EVP_IDEA_KEY;
BLOCK_CIPHER_func_cbc(idea, idea, EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_func_ofb(idea, idea, EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_func_cfb(idea, idea, EVP_IDEA_KEY, ks)
+BLOCK_CIPHER_func_ofb(idea, idea,
64,
EVP_IDEA_KEY, ks)
+BLOCK_CIPHER_func_cfb(idea, idea,
64,
EVP_IDEA_KEY, ks)
-BLOCK_CIPHER_defs(idea, IDEA_KEY_SCHEDULE, NID_idea, 8, 16, 8,
+BLOCK_CIPHER_defs(idea, IDEA_KEY_SCHEDULE, NID_idea, 8, 16, 8,
64,
0, idea_init_key, NULL,
EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
0, idea_init_key, NULL,
EVP_CIPHER_set_asn1_iv, EVP_CIPHER_get_asn1_iv, NULL)
@@
-109,7
+109,7
@@
static int idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
idea_set_encrypt_key(key,&tmp);
idea_set_decrypt_key(&tmp,ctx->cipher_data);
idea_set_encrypt_key(key,&tmp);
idea_set_decrypt_key(&tmp,ctx->cipher_data);
-
memset((unsigned char *)&tmp,0
,
+
OPENSSL_cleanse((unsigned char *)&tmp
,
sizeof(IDEA_KEY_SCHEDULE));
}
return 1;
sizeof(IDEA_KEY_SCHEDULE));
}
return 1;