X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=crypt.c;h=352c5b8d8e97832ed3d782ce3ad1984890ad5cf7;hp=679ba35dd07d59ec184942524f8a1bb0be786939;hb=8ea8abb73199b32fdd7afdf8825afa42ed8de244;hpb=a9126f461792a84c760162ecb25100f1593d427d

diff --git a/crypt.c b/crypt.c
index 679ba35d..352c5b8d 100644
--- a/crypt.c
+++ b/crypt.c
@@ -6,6 +6,7 @@
 
 /** \file crypt.c openssl-based RSA encryption/decryption routines */
 
+#include <regex.h>
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -145,38 +146,11 @@ int para_decrypt_buffer(char *key_file, unsigned char *outbuf, unsigned char *in
 	ret = get_rsa_key(key_file, &rsa, LOAD_PRIVATE_KEY);
 	if (ret < 0)
 		return ret;
-	ret = RSA_private_decrypt(inlen, inbuf, outbuf, rsa, RSA_PKCS1_PADDING);
+	ret = RSA_private_decrypt(inlen, inbuf, outbuf, rsa, RSA_PKCS1_OAEP_PADDING);
 	rsa_free(rsa);
 	return (ret > 0)? ret : -E_DECRYPT;
 }
 
-/**
- * decrypt the challenge number sent by para_server
- *
- * \param key_file full path of the rsa key
- * \param challenge_nr result is stored here
- * \param inbuf the input buffer
- * \param rsa_inlen the length of \a inbuf
- *
- * \return positive on success, negative on errors
- *
- * \sa para_decrypt_buffer()
- */
-int para_decrypt_challenge(char *key_file, long unsigned *challenge_nr,
-		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);
-
-	if (ret >= 0) {
-		rsa_out[ret] = '\0';
-		ret = sscanf((char *)rsa_out, "%lu", challenge_nr) == 1?
-			1 : -E_CHALLENGE;
-	}
-	OPENSSL_free(rsa_out);
-	return ret;
-}
-
 /**
  * encrypt a buffer using an RSA key
  *
@@ -196,31 +170,8 @@ int para_encrypt_buffer(RSA *rsa, unsigned char *inbuf,
 
 	if (flen < 0)
 		return -E_ENCRYPT;
-	ret = RSA_public_encrypt(flen, inbuf, outbuf, rsa, RSA_PKCS1_PADDING);
-	return ret < 0?  -E_ENCRYPT : ret;
-}
-
-/**
- * encrypt the given challenge number
- *
- * \param rsa: public rsa key
- * \param challenge_nr the number to be encrypted
- * \param outbuf the output buffer
- *
- * \a outbuf must be at least 64 bytes long
- *
- * \return The size of the encrypted data on success, negative on errors
- *
- * \sa para_encrypt_buffer()
- *
- */
-int para_encrypt_challenge(RSA* rsa, long unsigned challenge_nr,
-	unsigned char *outbuf)
-{
-	unsigned char *inbuf = (unsigned char*) make_message("%lu", challenge_nr);
-	int ret = para_encrypt_buffer(rsa, inbuf, strlen((char *)inbuf), outbuf);
-	free(inbuf);
-	return ret;
+	ret = RSA_public_encrypt(flen, inbuf, outbuf, rsa, RSA_PKCS1_OAEP_PADDING);
+	return ret < 0? -E_ENCRYPT : ret;
 }
 
 /**