X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt.c;h=ba2e7df0c4c8cd2b88200f198c5dff8ae0db1155;hp=0d8b42410ea133355d396a2c689ddaf84b12c160;hb=df3c03e72911edb31e7f1e32ebe29dad063e3b70;hpb=9f487d2aaaa3462d9e4ecd76f22a75c9ae847e92

diff --git a/crypt.c b/crypt.c
index 0d8b4241..ba2e7df0 100644
--- a/crypt.c
+++ b/crypt.c
@@ -57,7 +57,8 @@ int get_rsa_key(char *key_file, RSA **rsa, int private)
 	EVP_PKEY *key = load_key(key_file, private);
 
 	if (!key)
-		return (private == LOAD_PRIVATE_KEY)? -E_PRIVATE_KEY : -E_PUBLIC_KEY;
+		return (private == LOAD_PRIVATE_KEY)? -E_PRIVATE_KEY
+			: -E_PUBLIC_KEY;
 	*rsa = EVP_PKEY_get1_RSA(key);
 	EVP_PKEY_free(key);
 	if (!*rsa)
@@ -93,14 +94,17 @@ void rsa_free(RSA *rsa)
  * \sa RSA_private_decrypt(3)
  **/
 int para_decrypt_buffer(char *key_file, unsigned char *outbuf, unsigned char *inbuf,
-			int rsa_inlen)
+			unsigned rsa_inlen)
 {
 	RSA *rsa;
-	int ret = get_rsa_key(key_file, &rsa, LOAD_PRIVATE_KEY);
+	int ret, inlen = rsa_inlen;
 
+	if (inlen < 0)
+		return -E_RSA;
+	ret = get_rsa_key(key_file, &rsa, LOAD_PRIVATE_KEY);
 	if (ret < 0)
 		return ret;
-	ret = RSA_private_decrypt(rsa_inlen, inbuf, outbuf, rsa, RSA_PKCS1_PADDING);
+	ret = RSA_private_decrypt(inlen, inbuf, outbuf, rsa, RSA_PKCS1_PADDING);
 	rsa_free(rsa);
 	return (ret > 0)? ret : -E_DECRYPT;
 }
@@ -118,7 +122,7 @@ int para_decrypt_buffer(char *key_file, unsigned char *outbuf, unsigned char *in
  * \sa para_decrypt_buffer()
  */
 int para_decrypt_challenge(char *key_file, long unsigned *challenge_nr,
-		unsigned char *inbuf, int rsa_inlen)
+		unsigned char *inbuf, unsigned rsa_inlen)
 {
 	unsigned char *rsa_out = OPENSSL_malloc(rsa_inlen + 1);
 	int ret = para_decrypt_buffer(key_file, rsa_out, inbuf, rsa_inlen);
@@ -145,10 +149,13 @@ int para_decrypt_challenge(char *key_file, long unsigned *challenge_nr,
  * \sa RSA_public_encrypt(3)
  */
 int para_encrypt_buffer(RSA *rsa, unsigned char *inbuf,
-		const unsigned len, unsigned char *outbuf)
+		unsigned len, unsigned char *outbuf)
 {
-	int ret = RSA_public_encrypt(len, inbuf, outbuf, rsa,
-		RSA_PKCS1_PADDING);
+	int ret, flen = len; /* RSA_public_encrypt expects a signed int */
+
+	if (flen < 0)
+		return -E_ENCRYPT;
+	ret = RSA_public_encrypt(flen, inbuf, outbuf, rsa, RSA_PKCS1_PADDING);
 	return ret < 0?  -E_ENCRYPT : ret;
 }