summaryrefslogtreecommitdiff
path: root/sshkey.c
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2019-07-07 01:05:00 +0000
committerDamien Miller <djm@mindrot.org>2019-07-08 11:45:51 +1000
commit696fb4298e80f2ebcd188986a91b49af3b7ca14c (patch)
treeb07d04b5035781544ddb0e9e9fee1476bf564850 /sshkey.c
parent156e9e85e92b46ca90226605d9eff49e8ec31b22 (diff)
downloadopenssh-git-696fb4298e80f2ebcd188986a91b49af3b7ca14c.tar.gz
upstream: Remove some set but never used variables. ok daraadt@
OpenBSD-Commit-ID: 824baf9c59afc66a4637017e397b9b74a41684e7
Diffstat (limited to 'sshkey.c')
-rw-r--r--sshkey.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/sshkey.c b/sshkey.c
index 5d28c457..6b5ff048 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshkey.c,v 1.78 2019/06/27 06:29:35 djm Exp $ */
+/* $OpenBSD: sshkey.c,v 1.79 2019/07/07 01:05:00 dtucker Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@@ -950,7 +950,6 @@ fingerprint_b64(const char *alg, u_char *dgst_raw, size_t dgst_raw_len)
char *ret;
size_t plen = strlen(alg) + 1;
size_t rlen = ((dgst_raw_len + 2) / 3) * 4 + plen + 1;
- int r;
if (dgst_raw_len > 65536 || (ret = calloc(1, rlen)) == NULL)
return NULL;
@@ -958,8 +957,7 @@ fingerprint_b64(const char *alg, u_char *dgst_raw, size_t dgst_raw_len)
strlcat(ret, ":", rlen);
if (dgst_raw_len == 0)
return ret;
- if ((r = b64_ntop(dgst_raw, dgst_raw_len,
- ret + plen, rlen - plen)) == -1) {
+ if (b64_ntop(dgst_raw, dgst_raw_len, ret + plen, rlen - plen) == -1) {
freezero(ret, rlen);
return NULL;
}