diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2019-07-07 01:05:00 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-07-08 11:45:51 +1000 |
commit | 696fb4298e80f2ebcd188986a91b49af3b7ca14c (patch) | |
tree | b07d04b5035781544ddb0e9e9fee1476bf564850 /sshkey.c | |
parent | 156e9e85e92b46ca90226605d9eff49e8ec31b22 (diff) |
upstream: Remove some set but never used variables. ok daraadt@
OpenBSD-Commit-ID: 824baf9c59afc66a4637017e397b9b74a41684e7
Diffstat (limited to 'sshkey.c')
-rw-r--r-- | sshkey.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshkey.c,v 1.78 2019/06/27 06:29:35 djm Exp $ */ | 1 | /* $OpenBSD: sshkey.c,v 1.79 2019/07/07 01:05:00 dtucker Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2008 Alexander von Gernler. All rights reserved. | 4 | * 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) | |||
950 | char *ret; | 950 | char *ret; |
951 | size_t plen = strlen(alg) + 1; | 951 | size_t plen = strlen(alg) + 1; |
952 | size_t rlen = ((dgst_raw_len + 2) / 3) * 4 + plen + 1; | 952 | size_t rlen = ((dgst_raw_len + 2) / 3) * 4 + plen + 1; |
953 | int r; | ||
954 | 953 | ||
955 | if (dgst_raw_len > 65536 || (ret = calloc(1, rlen)) == NULL) | 954 | if (dgst_raw_len > 65536 || (ret = calloc(1, rlen)) == NULL) |
956 | return NULL; | 955 | return NULL; |
@@ -958,8 +957,7 @@ fingerprint_b64(const char *alg, u_char *dgst_raw, size_t dgst_raw_len) | |||
958 | strlcat(ret, ":", rlen); | 957 | strlcat(ret, ":", rlen); |
959 | if (dgst_raw_len == 0) | 958 | if (dgst_raw_len == 0) |
960 | return ret; | 959 | return ret; |
961 | if ((r = b64_ntop(dgst_raw, dgst_raw_len, | 960 | if (b64_ntop(dgst_raw, dgst_raw_len, ret + plen, rlen - plen) == -1) { |
962 | ret + plen, rlen - plen)) == -1) { | ||
963 | freezero(ret, rlen); | 961 | freezero(ret, rlen); |
964 | return NULL; | 962 | return NULL; |
965 | } | 963 | } |