summaryrefslogtreecommitdiff
path: root/crypto/bf
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2008-11-12 03:58:08 +0000
committerGeoff Thorpe <geoff@openssl.org>2008-11-12 03:58:08 +0000
commit6343829a391df59e46e513c84b6264ee71ad9518 (patch)
tree9823103bf5828e47081ac906203516bdc332f577 /crypto/bf
parent2401debe83e8df930907a39065ebf9a54354f123 (diff)
downloadopenssl-new-6343829a391df59e46e513c84b6264ee71ad9518.tar.gz
Revert the size_t modifications from HEAD that had led to more
knock-on work than expected - they've been extracted into a patch series that can be completed elsewhere, or in a different branch, before merging back to HEAD.
Diffstat (limited to 'crypto/bf')
-rw-r--r--crypto/bf/bf_skey.c2
-rw-r--r--crypto/bf/blowfish.h3
2 files changed, 2 insertions, 3 deletions
diff --git a/crypto/bf/bf_skey.c b/crypto/bf/bf_skey.c
index d091a1ac8d..3673cdee6e 100644
--- a/crypto/bf/bf_skey.c
+++ b/crypto/bf/bf_skey.c
@@ -62,7 +62,7 @@
#include "bf_locl.h"
#include "bf_pi.h"
-void BF_set_key(BF_KEY *key, size_t len, const unsigned char *data)
+void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
{
int i;
BF_LONG *p,ri,in[2];
diff --git a/crypto/bf/blowfish.h b/crypto/bf/blowfish.h
index 02db3244b2..b97e76f9a3 100644
--- a/crypto/bf/blowfish.h
+++ b/crypto/bf/blowfish.h
@@ -60,7 +60,6 @@
#define HEADER_BLOWFISH_H
#include <openssl/e_os2.h>
-#include <unistd.h>
#ifdef __cplusplus
extern "C" {
@@ -106,7 +105,7 @@ typedef struct bf_key_st
} BF_KEY;
-void BF_set_key(BF_KEY *key, size_t len, const unsigned char *data);
+void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
void BF_encrypt(BF_LONG *data,const BF_KEY *key);
void BF_decrypt(BF_LONG *data,const BF_KEY *key);