From 0dd71375e7fe3ba80a225ffb4304319a756aee78 Mon Sep 17 00:00:00 2001 From: Jon Simons Date: Mon, 10 Feb 2020 13:37:14 -0500 Subject: [PATCH] pki: fix `pki_key_ecdsa_to_key_type` thread-safety Resolves https://bugs.libssh.org/T214. Signed-off-by: Jon Simons Reviewed-by: Jakub Jelen (cherry picked from commit 3664ba2800eaa1b54008b232d7f0404871d2f8d9) --- src/pki_crypto.c | 2 +- src/pki_gcrypt.c | 2 +- src/pki_mbedcrypto.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pki_crypto.c b/src/pki_crypto.c index 03511929..26d2da1d 100644 --- a/src/pki_crypto.c +++ b/src/pki_crypto.c @@ -94,7 +94,7 @@ static int pki_key_ecdsa_to_nid(EC_KEY *k) static enum ssh_keytypes_e pki_key_ecdsa_to_key_type(EC_KEY *k) { - static int nid; + int nid; nid = pki_key_ecdsa_to_nid(k); diff --git a/src/pki_gcrypt.c b/src/pki_gcrypt.c index 8cba9ede..43d60896 100644 --- a/src/pki_gcrypt.c +++ b/src/pki_gcrypt.c @@ -741,7 +741,7 @@ static int pki_key_ecdsa_to_nid(gcry_sexp_t k) static enum ssh_keytypes_e pki_key_ecdsa_to_key_type(gcry_sexp_t k) { - static int nid; + int nid; nid = pki_key_ecdsa_to_nid(k); diff --git a/src/pki_mbedcrypto.c b/src/pki_mbedcrypto.c index 64d3a436..6e3d425c 100644 --- a/src/pki_mbedcrypto.c +++ b/src/pki_mbedcrypto.c @@ -64,7 +64,7 @@ static int pki_key_ecdsa_to_nid(mbedtls_ecdsa_context *ecdsa) static enum ssh_keytypes_e pki_key_ecdsa_to_key_type(mbedtls_ecdsa_context *ecdsa) { - static int nid; + int nid; nid = pki_key_ecdsa_to_nid(ecdsa);