diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-15 16:40:11 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-15 16:40:11 -0400 |
| commit | 76c33f7ff46df47df0cc880595c4d943d50f019b (patch) | |
| tree | 11448ec9afd6990160ce6212c020d3c2630448d6 /src/tools/tor-gencert.c | |
| parent | c1deabd3b0c9e2701696afc80ac8392f0efda2c7 (diff) | |
| parent | a28e239b171c1a69fd32b6583bca0559f7116445 (diff) | |
| download | tor-76c33f7ff46df47df0cc880595c4d943d50f019b.tar.gz tor-76c33f7ff46df47df0cc880595c4d943d50f019b.zip | |
Merge branch 'scan-build-032'
Diffstat (limited to 'src/tools/tor-gencert.c')
| -rw-r--r-- | src/tools/tor-gencert.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/tools/tor-gencert.c b/src/tools/tor-gencert.c index 395535697f..600e2252d4 100644 --- a/src/tools/tor-gencert.c +++ b/src/tools/tor-gencert.c @@ -430,7 +430,7 @@ key_to_string(EVP_PKEY *key) static int get_fingerprint(EVP_PKEY *pkey, char *out) { - int r = 1; + int r = -1; crypto_pk_t *pk = crypto_new_pk_from_rsa_(EVP_PKEY_get1_RSA(pkey)); if (pk) { r = crypto_pk_get_fingerprint(pk, out, 0); @@ -443,7 +443,7 @@ get_fingerprint(EVP_PKEY *pkey, char *out) static int get_digest(EVP_PKEY *pkey, char *out) { - int r = 1; + int r = -1; crypto_pk_t *pk = crypto_new_pk_from_rsa_(EVP_PKEY_get1_RSA(pkey)); if (pk) { r = crypto_pk_get_digest(pk, out); @@ -472,8 +472,12 @@ generate_certificate(void) char signature[1024]; /* handles up to 8192-bit keys. */ int r; - get_fingerprint(identity_key, fingerprint); - get_digest(identity_key, id_digest); + if (get_fingerprint(identity_key, fingerprint) < 0) { + return -1; + } + if (get_digest(identity_key, id_digest)) { + return -1; + } tor_localtime_r(&now, &tm); tm.tm_mon += months_lifetime; |