X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fgcrypt%2Frsa.c;h=ceb163891f880eafe1c95854981fa2990fe43104;hb=3fca2cad485ef70360bca085c5c4d052b6deb15b;hp=62a21290f28b6c302b8cd949f81e0e79b5d2c09b;hpb=761517c21c37a808a19b487aa116c3c19439feca;p=tinc

diff --git a/src/gcrypt/rsa.c b/src/gcrypt/rsa.c
index 62a21290..ceb16389 100644
--- a/src/gcrypt/rsa.c
+++ b/src/gcrypt/rsa.c
@@ -184,7 +184,7 @@ bool rsa_set_hex_public_key(rsa_t *rsa, char *n, char *e) {
 	gcry_error_t err = 0;
 
 	err = gcry_mpi_scan(&rsa->n, GCRYMPI_FMT_HEX, n, 0, NULL)
-		?: gcry_mpi_scan(&rsa->e, GCRYMPI_FMT_HEX, n, 0, NULL);
+		?: gcry_mpi_scan(&rsa->e, GCRYMPI_FMT_HEX, e, 0, NULL);
 
 	if(err) {
 		logger(LOG_ERR, "Error while reading RSA public key: %s", gcry_strerror(errno));
@@ -198,8 +198,8 @@ bool rsa_set_hex_private_key(rsa_t *rsa, char *n, char *e, char *d) {
 	gcry_error_t err = 0;
 
 	err = gcry_mpi_scan(&rsa->n, GCRYMPI_FMT_HEX, n, 0, NULL)
-		?: gcry_mpi_scan(&rsa->e, GCRYMPI_FMT_HEX, n, 0, NULL)
-		?: gcry_mpi_scan(&rsa->d, GCRYMPI_FMT_HEX, n, 0, NULL);
+		?: gcry_mpi_scan(&rsa->e, GCRYMPI_FMT_HEX, e, 0, NULL)
+		?: gcry_mpi_scan(&rsa->d, GCRYMPI_FMT_HEX, d, 0, NULL);
 
 	if(err) {
 		logger(LOG_ERR, "Error while reading RSA public key: %s", gcry_strerror(errno));
@@ -267,7 +267,7 @@ size_t rsa_size(rsa_t *rsa) {
  */
 
 // TODO: get rid of this macro, properly clean up gcry_ structures after use
-#define check(foo) { gcry_error_t err = (foo); if(err) {logger(LOG_ERR, "gcrypt error %s/%s at %s:%d\n", gcry_strsource(err), gcry_strerror(err), __FILE__, __LINE__); return false; }}
+#define check(foo) { gcry_error_t err = (foo); if(err) {logger(LOG_ERR, "gcrypt error %s/%s at %s:%d", gcry_strsource(err), gcry_strerror(err), __FILE__, __LINE__); return false; }}
 
 bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
 	gcry_mpi_t inmpi;
@@ -276,6 +276,10 @@ bool rsa_public_encrypt(rsa_t *rsa, void *in, size_t len, void *out) {
 	gcry_mpi_t outmpi = gcry_mpi_new(len * 8);
 	gcry_mpi_powm(outmpi, inmpi, rsa->e, rsa->n);
 
+	int pad = len - (gcry_mpi_get_nbits(outmpi) + 7) / 8;
+	while(pad--)
+		*(char *)out++ = 0;
+
 	check(gcry_mpi_print(GCRYMPI_FMT_USG, out,len, NULL, outmpi));
 
 	return true;
@@ -288,6 +292,10 @@ bool rsa_private_decrypt(rsa_t *rsa, void *in, size_t len, void *out) {
 	gcry_mpi_t outmpi = gcry_mpi_new(len * 8);
 	gcry_mpi_powm(outmpi, inmpi, rsa->d, rsa->n);
 
+	int pad = len - (gcry_mpi_get_nbits(outmpi) + 7) / 8;
+	while(pad--)
+		*(char *)out++ = 0;
+
 	check(gcry_mpi_print(GCRYMPI_FMT_USG, out,len, NULL, outmpi));
 
 	return true;