projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove NOPROTO definitions and error code comments.
[openssl.git]
/
crypto
/
evp
/
e_cbc_r2.c
diff --git
a/crypto/evp/e_cbc_r2.c
b/crypto/evp/e_cbc_r2.c
index 695b211518506b60da4367b69e8c2cd40f588f4c..d6a568f4b332d6ea85455bce54706d52086b63c3 100644
(file)
--- a/
crypto/evp/e_cbc_r2.c
+++ b/
crypto/evp/e_cbc_r2.c
@@
-63,7
+63,6
@@
#include <openssl/evp.h>
#include <openssl/objects.h>
#include <openssl/evp.h>
#include <openssl/objects.h>
-#ifndef NOPROTO
static void rc2_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
unsigned char *iv,int enc);
static void rc2_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
static void rc2_cbc_init_key(EVP_CIPHER_CTX *ctx, unsigned char *key,
unsigned char *iv,int enc);
static void rc2_cbc_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
@@
-73,16
+72,6
@@
static EVP_CIPHER *rc2_magic_to_meth(int i);
static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
static int rc2_set_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
static int rc2_get_asn1_type_and_iv(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
-#else
-
-static void rc2_cbc_init_key();
-static void rc2_cbc_cipher();
-static int rc2_meth_to_magic();
-static EVP_CIPHER *rc2_magic_to_meth();
-static int rc2_set_asn1_type_and_iv();
-static int rc2_get_asn1_type_and_iv();
-#endif
-
#define RC2_40_MAGIC 0xa0
#define RC2_64_MAGIC 0x78
#define RC2_128_MAGIC 0x3a
#define RC2_40_MAGIC 0xa0
#define RC2_64_MAGIC 0x78
#define RC2_128_MAGIC 0x3a