upstream: Oops, incorrect hex conversion spotted by claudio.

While here try to improve how it reads a bit better.  Surprising the
regression tests didn't spot this error, maybe it fails to roundtrip the
values.

OpenBSD-Commit-ID: 866cfcc1955aef8f3fc32da0b70c353a1b859f2e
This commit is contained in:
deraadt@openbsd.org 2024-04-02 12:22:38 +00:00 committed by Damien Miller
parent ec78c31409
commit 54343a260e
No known key found for this signature in database
1 changed files with 4 additions and 5 deletions

View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-pkcs11.c,v 1.61 2024/04/02 09:48:24 claudio Exp $ */ /* $OpenBSD: ssh-pkcs11.c,v 1.62 2024/04/02 12:22:38 deraadt Exp $ */
/* /*
* Copyright (c) 2010 Markus Friedl. All rights reserved. * Copyright (c) 2010 Markus Friedl. All rights reserved.
* Copyright (c) 2014 Pedro Martelletto. All rights reserved. * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@ -1389,14 +1389,13 @@ static int
h2i(char c) h2i(char c)
{ {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
c -= '0'; return c - '0';
else if (c >= 'a' && c <= 'f') else if (c >= 'a' && c <= 'f')
c -= 'a'; return c - 'a' + 10;
else if (c >= 'A' && c <= 'F') else if (c >= 'A' && c <= 'F')
c -= 'A'; return c - 'A' + 10;
else else
return -1; return -1;
return c;
} }
static int static int