Rename controlcookie file to pidfile.

[meshlink] / src / gcrypt / rsa.c

diff --git a/src/gcrypt/rsa.c b/src/gcrypt/rsa.c
index 5e4ba41fdedba7e6102e378e092c2559909cfff2..ceb163891f880eafe1c95854981fa2990fe43104 100644 (file)
--- a/src/gcrypt/rsa.c
+++ b/src/gcrypt/rsa.c
@@ -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;