crypto/modes: make modes.h selfsufficient and rename block_f to block128_t.

1 files changed, 17 insertions, 9 deletions

diff --git a/crypto/modes/modes.h b/crypto/modes/modes.h
index 87e0ec6115..6315a60fc4 100644
--- a/crypto/modes/modes.h
+++ b/crypto/modes/modes.h
@@ -1,34 +1,42 @@
-typedef void (*block_f)(const unsigned char in[16],
+/* ====================================================================
+ * Copyright (c) 2008 The OpenSSL Project. All rights reserved.
+ *
+ * Rights for redistribution and usage in source and binary
+ * forms are granted according to the OpenSSL license.
+ */
+
+#include <stddef.h>
+
+typedef void (*block128_f)(const unsigned char in[16],
 			unsigned char out[16],
 			const void *key);
 
 void CRYPTO_cbc128_encrypt(const unsigned char *in, unsigned char *out,
 			size_t len, const void *key,
-			unsigned char ivec[16], block_f block);
+			unsigned char ivec[16], block128_f block);
 void CRYPTO_cbc128_decrypt(const unsigned char *in, unsigned char *out,
 			size_t len, const void *key,
-			unsigned char ivec[16], block_f block);
+			unsigned char ivec[16], block128_f block);
 
 void CRYPTO_ctr128_encrypt(const unsigned char *in, unsigned char *out,
 			size_t len, const void *key,
 			unsigned char ivec[16], unsigned char ecount_buf[16],
-			unsigned int *num, block_f block);
+			unsigned int *num, block128_f block);
 
 void CRYPTO_ofb128_encrypt(const unsigned char *in, unsigned char *out,
 			size_t len, const void *key,
 			unsigned char ivec[16], int *num,
-			block_f block);
+			block128_f block);
 
 void CRYPTO_cfb128_encrypt(const unsigned char *in, unsigned char *out,
 			size_t len, const void *key,
 			unsigned char ivec[16], int *num,
-			int enc, block_f block);
+			int enc, block128_f block);
 void CRYPTO_cfb128_8_encrypt(const unsigned char *in, unsigned char *out,
 			size_t length, const void *key,
 			unsigned char ivec[16], int *num,
-			int enc, block_f block);
+			int enc, block128_f block);
 void CRYPTO_cfb128_1_encrypt(const unsigned char *in, unsigned char *out,
 			size_t bits, const void *key,
 			unsigned char ivec[16], int *num,
-			int enc, block_f block);
-
+			int enc, block128_f block);