summaryrefslogtreecommitdiff
path: root/contrib/pgcrypto/pgp-s2k.c
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2014-04-17 12:37:53 -0400
committerBruce Momjian <bruce@momjian.us>2014-04-17 12:37:53 -0400
commitfc72e94a13026b86a06c7f5c670f4c16420d3d77 (patch)
tree0572054c47891b08d2e47a3223a09eea87f2b46c /contrib/pgcrypto/pgp-s2k.c
parent071d9f085089f3fbae1b472debd38c555cd4a436 (diff)
pgcrypto: fix memset() calls that might be optimized away
Specifically, on-stack memset() might be removed, so: * Replace memset() with px_memset() * Add px_memset to copy_crlf() * Add px_memset to pgp-s2k.c Patch by Marko Kreen Report by PVS-Studio Backpatch through 8.4.
Diffstat (limited to 'contrib/pgcrypto/pgp-s2k.c')
-rw-r--r--contrib/pgcrypto/pgp-s2k.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/pgcrypto/pgp-s2k.c b/contrib/pgcrypto/pgp-s2k.c
index 349234e243c..40c05a1a96e 100644
--- a/contrib/pgcrypto/pgp-s2k.c
+++ b/contrib/pgcrypto/pgp-s2k.c
@@ -75,6 +75,7 @@ calc_s2k_simple(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
remain = 0;
}
}
+ px_memset(buf, 0, sizeof(buf));
return 0;
}
@@ -118,6 +119,7 @@ calc_s2k_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key, unsigned key_len)
remain = 0;
}
}
+ px_memset(buf, 0, sizeof(buf));
return 0;
}
@@ -189,6 +191,7 @@ calc_s2k_iter_salted(PGP_S2K *s2k, PX_MD *md, const uint8 *key,
remain = 0;
}
}
+ px_memset(buf, 0, sizeof(buf));
return 0;
}