Remove NOPROTO definitions and error code comments.

[openssl.git] / crypto / cast / cast.h

diff --git a/crypto/cast/cast.h b/crypto/cast/cast.h
index 528cb7c824475bbf0761adcfa679753f1dd455cb..c2657981b28852dbdd3de6ab8fb8e1f5ccf082b6 100644 (file)
--- a/crypto/cast/cast.h
+++ b/crypto/cast/cast.h
@@ -74,9 +74,9 @@ extern "C" {
 typedef struct cast_key_st
        {
        CAST_LONG data[32];
+       int short_key;  /* Use reduced rounds for short key */
        } CAST_KEY;
 
-#ifndef NOPROTO
  
 void CAST_set_key(CAST_KEY *key, int len, unsigned char *data);
 void CAST_ecb_encrypt(unsigned char *in,unsigned char *out,CAST_KEY *key,
@@ -90,18 +90,6 @@ void CAST_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
 void CAST_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
        CAST_KEY *schedule, unsigned char *ivec, int *num);
 
-#else
-
-void CAST_set_key();
-void CAST_ecb_encrypt();
-void CAST_encrypt();
-void CAST_decrypt();
-void CAST_cbc_encrypt();
-void CAST_cfb64_encrypt();
-void CAST_ofb64_encrypt();
-
-#endif
-
 #ifdef  __cplusplus
 }
 #endif