From: djm@openbsd.org <djm@openbsd.org>
Date: Thu, 24 Jul 2025 06:59:51 +0000 (+0000)
Subject: upstream: less stale reference to PKCS#1 1.5 hash OIDs; feedback
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=9f8ccc3b81b53324cc489f3fe00f03c329c0acb2;p=thirdparty%2Fopenssh-portable.git

upstream: less stale reference to PKCS#1 1.5 hash OIDs; feedback

from tb@

OpenBSD-Commit-ID: 9fda77978491a130a7b77d87d40c79277b796721
---

diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index 147c52049..c28da677d 100644
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.65 2025/07/24 05:44:55 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.66 2025/07/24 06:59:51 djm Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -467,8 +467,7 @@ pkcs11_lookup_key(struct sshkey *key)
 #ifdef WITH_OPENSSL
 /*
  * See:
- * http://www.rsasecurity.com/rsalabs/pkcs/pkcs-1/
- * ftp://ftp.rsasecurity.com/pub/pkcs/pkcs-1/pkcs-1v2-1.asn
+ * https://datatracker.ietf.org/doc/html/rfc8017#section-9.2
  */
 
 /*
@@ -485,7 +484,6 @@ static const u_char id_sha1[] = {
 };
 
 /*
- * See http://csrc.nist.gov/groups/ST/crypto_apps_infra/csor/algorithms.html
  * id-sha256 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840)
  *      organization(1) gov(101) csor(3) nistAlgorithm(4) hashAlgs(2)
  *      id-sha256(1) }
@@ -500,7 +498,6 @@ static const u_char id_sha256[] = {
 };
 
 /*
- * See http://csrc.nist.gov/groups/ST/crypto_apps_infra/csor/algorithms.html
  * id-sha512 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840)
  *      organization(1) gov(101) csor(3) nistAlgorithm(4) hashAlgs(2)
  *      id-sha256(3) }