summaryrefslogtreecommitdiff
path: root/ssh-pkcs11.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2021-06-25 06:30:22 +0000
committerDamien Miller <djm@mindrot.org>2021-06-25 16:32:34 +1000
commitd443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b (patch)
treee5ff0f34aae565d3129f88504a2ddcb84356d141 /ssh-pkcs11.c
parent2a5704ec142202d387fda2d6872fd4715ab81347 (diff)
downloadopenssh-git-d443006c0ddfa7f6a5bd9c0ae92036f3d5f2fa3b.tar.gz
upstream: fix decoding of X.509 subject name; from Leif Thuresson
via bz3327 ok markus@ OpenBSD-Commit-ID: 0ea2e28f39750dd388b7e317bc43dd997a217ae8
Diffstat (limited to 'ssh-pkcs11.c')
-rw-r--r--ssh-pkcs11.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 844aa9ff..4de29b34 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.52 2020/11/22 22:38:26 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.53 2021/06/25 06:30:22 djm Exp $ */
/*
* Copyright (c) 2010 Markus Friedl. All rights reserved.
* Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -973,7 +973,7 @@ pkcs11_fetch_x509_pubkey(struct pkcs11_provider *p, CK_ULONG slotidx,
}
/* Decode DER-encoded cert subject */
- cp = cert_attr[2].pValue;
+ cp = cert_attr[1].pValue;
if ((x509_name = d2i_X509_NAME(NULL, &cp,
cert_attr[1].ulValueLen)) == NULL ||
(subject = X509_NAME_oneline(x509_name, NULL, 0)) == NULL)