Free resources in rsa_t.

[tinc] / src / gcrypt / rsa.c

diff --git a/src/gcrypt/rsa.c b/src/gcrypt/rsa.c
index 62a2129..e38b50b 100644 (file)
--- 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));
@@ -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,7 +292,17 @@ 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;
 }
+
+void rsa_free(rsa_t *rsa) {
+       gcry_mpi_release(rsa->n);
+       gcry_mpi_release(rsa->e);
+       gcry_mpi_release(rsa->d);
+}