[openssh-commits] [openssh] 05/05: upstream: allow an empty attestation certificate returned by a

git+noreply at mindrot.org git+noreply at mindrot.org
Wed Nov 13 10:15:56 AEDT 2019


This is an automated email from the git hooks/post-receive script.

djm pushed a commit to branch master
in repository openssh.

commit fccff339cab5aa66f2554e0188b83f980683490b
Author: djm at openbsd.org <djm at openbsd.org>
Date:   Tue Nov 12 22:38:19 2019 +0000

    upstream: allow an empty attestation certificate returned by a
    
    security key enrollment - these are possible for tokens that only offer self-
    attestation. This also needs support from the middleware.
    
    ok markus@
    
    OpenBSD-Commit-ID: 135eeeb937088ef6830a25ca0bbe678dfd2c57cc
---
 ssh-sk.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ssh-sk.c b/ssh-sk.c
index ff9c6f28..41fa164b 100644
--- a/ssh-sk.c
+++ b/ssh-sk.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-sk.c,v 1.9 2019/11/12 19:34:40 markus Exp $ */
+/* $OpenBSD: ssh-sk.c,v 1.10 2019/11/12 22:38:19 djm Exp $ */
 /*
  * Copyright (c) 2019 Google LLC
  *
@@ -300,7 +300,8 @@ sshsk_enroll(int type, const char *provider_path, const char *application,
 	}
 	/* Check response validity */
 	if (resp->public_key == NULL || resp->key_handle == NULL ||
-	    resp->signature == NULL || resp->attestation_cert == NULL) {
+	    resp->signature == NULL ||
+	    (resp->attestation_cert == NULL && resp->attestation_cert_len != 0)) {
 		error("%s: sk_enroll response invalid", __func__);
 		r = SSH_ERR_INVALID_FORMAT;
 		goto out;

-- 
To stop receiving notification emails like this one, please contact
djm at mindrot.org.


More information about the openssh-commits mailing list