X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fidea%2Fi_skey.c;h=1c95bc9c7b8872e15d5df3df6cbece14fe5094b1;hb=94c00f3d4da27d9eed08083f1dea9645e90a3d0f;hp=00fcc1e586270d2a6247c1b3f7e79f6542a674a9;hpb=58964a492275ca9a59a0cd9c8155cb2491b4b909;p=oweals%2Fopenssl.git

diff --git a/crypto/idea/i_skey.c b/crypto/idea/i_skey.c
index 00fcc1e586..1c95bc9c7b 100644
--- a/crypto/idea/i_skey.c
+++ b/crypto/idea/i_skey.c
@@ -56,18 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#include "idea.h"
+#include <openssl/idea.h>
 #include "idea_lcl.h"
 
-#ifndef NOPROTO
 static IDEA_INT inverse(unsigned int xin);
-#else
-static IDEA_INT inverse();
-#endif
-
-void idea_set_encrypt_key(key, ks)
-unsigned char *key;
-IDEA_KEY_SCHEDULE *ks;
+void idea_set_encrypt_key(const unsigned char *key, IDEA_KEY_SCHEDULE *ks)
 	{
 	int i;
 	register IDEA_INT *kt,*kf,r0,r1,r2;
@@ -101,9 +94,7 @@ IDEA_KEY_SCHEDULE *ks;
 		}
 	}
 
-void idea_set_decrypt_key(ek, dk)
-IDEA_KEY_SCHEDULE *ek;
-IDEA_KEY_SCHEDULE *dk;
+void idea_set_decrypt_key(IDEA_KEY_SCHEDULE *ek, IDEA_KEY_SCHEDULE *dk)
 	{
 	int r;
 	register IDEA_INT *fp,*tp,t;
@@ -133,8 +124,7 @@ IDEA_KEY_SCHEDULE *dk;
 	}
 
 /* taken directly from the 'paper' I'll have a look at it later */
-static IDEA_INT inverse(xin)
-unsigned int xin;
+static IDEA_INT inverse(unsigned int xin)
 	{
 	long n1,n2,q,r,b1,b2,t;