upstream/oracle/userland-gate: comparison components/openssh/patches/035-fips.patch

equal deleted inserted replaced

-:e7955ccacd45
+:31ef2580c45d
 	{ "des",	SSH_CIPHER_DES, 8, 8, 0, 0, 0, 1, EVP_des_cbc },
 	{ "3des",	SSH_CIPHER_3DES, 8, 16, 0, 0, 0, 1, evp_ssh1_3des },
 diff -pur old/digest-openssl.c new/digest-openssl.c
 --- old/digest-openssl.c
 +++ new/digest-openssl.c
-@@ -53,8 +53,22 @@ struct ssh_digest {
+@@ -31,6 +31,7 @@
+#include "sshbuf.h"
+#include "digest.h"
+#include "ssherr.h"
++#include "misc.h"
+#ifndef HAVE_EVP_RIPEMD160
+# define EVP_ripemd160 NULL
+@@ -53,8 +54,22 @@ struct ssh_digest {
 	const EVP_MD *(*mdfunc)(void);
 };
 +#ifdef ENABLE_OPENSSL_FIPS
 /* NB. Indexed directly by algorithm number */
 const struct ssh_digest digests[] = {
 +#endif /* ENABLE_OPENSSL_FIPS */
 	{ SSH_DIGEST_MD5,	"MD5",	 	16,	EVP_md5 },
 	{ SSH_DIGEST_RIPEMD160,	"RIPEMD160",	20,	EVP_ripemd160 },
 	{ SSH_DIGEST_SHA1,	"SHA1",	 	20,	EVP_sha1 },
-@@ -67,6 +81,9 @@ const struct ssh_digest digests[] = {
+@@ -67,6 +82,9 @@ const struct ssh_digest digests[] = {
 static const struct ssh_digest *
 ssh_digest_by_alg(int alg)
 {
 +#ifdef ENABLE_OPENSSL_FIPS
 +	struct ssh_digest *digests = ssh_FIPS_mode() ? digests_fips : digests_dflt;
 +#endif
 	if (alg < 0 || alg >= SSH_DIGEST_MAX)
 		return NULL;
 	if (digests[alg].id != alg) /* sanity */
-@@ -79,6 +96,9 @@ ssh_digest_by_alg(int alg)
+@@ -79,6 +97,9 @@ ssh_digest_by_alg(int alg)
 int
 ssh_digest_alg_by_name(const char *name)
 {
 +#ifdef ENABLE_OPENSSL_FIPS
 +	struct ssh_digest *digests = ssh_FIPS_mode() ? digests_fips : digests_dflt;
 	for (alg = 0; digests[alg].id != -1; alg++) {
 diff -pur old/gss-genr.c new/gss-genr.c
 --- old/gss-genr.c
 +++ new/gss-genr.c
-@@ -100,6 +100,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
+@@ -44,6 +44,7 @@
+#include "cipher.h"
+#include "key.h"
+#include "kex.h"
++#include "misc.h"
+#include <openssl/evp.h>
+#include "ssh-gss.h"
+@@ -100,6 +101,7 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
 	char deroid[2];
 	const EVP_MD *evp_md = EVP_md5();
 	EVP_MD_CTX md;
 +	int fips_mode;
 	if (gss_enc2oid != NULL) {
 		for (i = 0; gss_enc2oid[i].encoded != NULL; i++)
-@@ -112,6 +113,14 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
+@@ -112,6 +114,14 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
 	buffer_init(&buf);
 +#ifdef ENABLE_OPENSSL_FIPS
 +	fips_mode = ssh_FIPS_mode();
 +	}
 +#endif
 	oidpos = 0;
 	for (i = 0; i < gss_supported->count; i++) {
 		if (gss_supported->elements[i].length < 128 &&
-@@ -119,7 +128,6 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
+@@ -119,7 +129,6 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
 			deroid[0] = SSH_GSS_OIDTYPE;
 			deroid[1] = gss_supported->elements[i].length;
 -
 			EVP_DigestInit(&md, evp_md);
 			EVP_DigestUpdate(&md, deroid, 2);
 			EVP_DigestUpdate(&md,
-@@ -151,6 +159,12 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
+@@ -151,6 +160,12 @@ ssh_gssapi_kex_mechs(gss_OID_set gss_sup
 			oidpos++;
 		}
 	}
 +#ifdef ENABLE_OPENSSL_FIPS
 +	if (fips_mode) {
 	gss_enc2oid[oidpos].encoded = NULL;
 diff -pur old/kex.c new/kex.c
 --- old/kex.c
 +++ new/kex.c
-@@ -89,7 +89,40 @@ struct kexalg {
+@@ -90,7 +90,43 @@ struct kexalg {
 	int ec_nid;
 	int hash_alg;
 };
 +
 +#ifdef ENABLE_OPENSSL_FIPS
 +/* in FIPS mode limit kexalgs to FIPS compliant only */
 +#define        kexalgs (ssh_FIPS_mode() ? kexalgs_fips : kexalgs_dflt)
 +static const struct kexalg kexalgs_fips[] = {
 +#ifdef WITH_OPENSSL
 +	{ KEX_DH1, KEX_DH_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
-+	{ KEX_DH14, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
++	{ KEX_DH14_SHA1, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
++	{ KEX_DH14_SHA256, KEX_DH_GRP14_SHA256, 0, SSH_DIGEST_SHA256 },
++	{ KEX_DH16_SHA512, KEX_DH_GRP16_SHA512, 0, SSH_DIGEST_SHA512 },
++	{ KEX_DH18_SHA512, KEX_DH_GRP18_SHA512, 0, SSH_DIGEST_SHA512 },
 +	{ KEX_DHGEX_SHA1, KEX_DH_GEX_SHA1, 0, SSH_DIGEST_SHA1 },
 +#ifdef HAVE_EVP_SHA256
 +	{ KEX_DHGEX_SHA256, KEX_DH_GEX_SHA256, 0, SSH_DIGEST_SHA256 },
 +#endif /* HAVE_EVP_SHA256 */
 +#ifdef OPENSSL_HAS_ECC
 +#else
 static const struct kexalg kexalgs[] = {
 +#endif
 #ifdef WITH_OPENSSL
 	{ KEX_DH1, KEX_DH_GRP1_SHA1, 0, SSH_DIGEST_SHA1 },
-	{ KEX_DH14, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
+	{ KEX_DH14_SHA1, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },
 diff -pur old/mac.c new/mac.c
 --- old/mac.c
 +++ new/mac.c
 @@ -53,8 +53,33 @@ struct macalg {
 	int		len;		/* just for UMAC */
 	{ "hmac-sha1",				SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 0 },
 	{ "hmac-sha1-96",			SSH_DIGEST, SSH_DIGEST_SHA1, 96, 0, 0, 0 },
 diff -pur old/misc.c new/misc.c
 --- old/misc.c
 +++ new/misc.c
-@@ -39,12 +39,15 @@
+@@ -39,12 +39,16 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
 +#include <dlfcn.h>
 #include <netinet/in_systm.h>
 #include <netinet/ip.h>
 #include <netinet/tcp.h>
 +#include <openssl/crypto.h>
++#include <openssl/err.h>
 +
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
-@@ -78,6 +81,60 @@ chop(char *s)
+@@ -78,6 +82,60 @@ chop(char *s)
 }
 +#ifdef ENABLE_OPENSSL_FIPS
 +/* is OpenSSL FIPS mode set? */
 int
 set_nonblock(int fd)
 diff -pur old/misc.h new/misc.h
 --- old/misc.h
 +++ new/misc.h
-@@ -38,6 +38,11 @@ struct ForwardOptions {
+@@ -40,6 +40,11 @@ struct ForwardOptions {
 char	*chop(char *);
 char	*strdelim(char **);
 +#ifdef ENABLE_OPENSSL_FIPS
 +int	 ssh_FIPS_mode();
 int	 unset_nonblock(int);
 void	 set_nodelay(int);
 diff -pur old/myproposal.h new/myproposal.h
 --- old/myproposal.h
 +++ new/myproposal.h
-@@ -83,19 +83,31 @@
+@@ -88,21 +88,33 @@
 # else
 #  define KEX_CURVE25519_METHODS ""
 # endif
 -#define KEX_COMMON_KEX \
 +
 +#define KEX_COMMON_KEX_DFLT \
 	KEX_CURVE25519_METHODS \
 	KEX_ECDH_METHODS \
-	KEX_SHA256_METHODS
+	KEX_SHA2_METHODS
 -#define KEX_SERVER_KEX KEX_COMMON_KEX \
 +#define KEX_SERVER_KEX_DFLT KEX_COMMON_KEX_DFLT \
+	KEX_SHA2_GROUP14 \
 	"diffie-hellman-group14-sha1" \
 -#define KEX_CLIENT_KEX KEX_COMMON_KEX \
 +#define KEX_CLIENT_KEX_DFLT KEX_COMMON_KEX_DFLT \
 	"diffie-hellman-group-exchange-sha1," \
+	KEX_SHA2_GROUP14 \
 	"diffie-hellman-group14-sha1"
 -#define	KEX_DEFAULT_PK_ALG	\
 +#define KEX_COMMON_KEX_FIPS \
 +	KEX_ECDH_METHODS \
-+	KEX_SHA256_METHODS
++	KEX_SHA2_METHODS
 +
 +#define KEX_SERVER_KEX_FIPS KEX_COMMON_KEX_FIPS \
 +	"diffie-hellman-group14-sha1" \
 +
 +#define KEX_CLIENT_KEX_FIPS KEX_COMMON_KEX_FIPS \
 +
 +#define	KEX_DEFAULT_PK_ALG_DFLT	\
 	HOSTKEY_ECDSA_CERT_METHODS \
 	"[email protected]," \
 	"[email protected]," \
-@@ -105,17 +117,32 @@
+@@ -112,17 +124,32 @@
 	"rsa-sha2-256," \
 	"ssh-rsa"
 +#define	KEX_DEFAULT_PK_ALG_FIPS	\
 +	HOSTKEY_ECDSA_CERT_METHODS \
 -#define KEX_SERVER_MAC \
 +#define KEX_SERVER_MAC_DFLT \
 	"[email protected]," \
 	"[email protected]," \
 	"[email protected]," \
-@@ -127,7 +154,42 @@
+@@ -134,7 +161,42 @@
 	"hmac-sha2-512," \
 	"hmac-sha1"
 -#define KEX_CLIENT_MAC KEX_SERVER_MAC
 +#define KEX_CLIENT_MAC_DFLT KEX_SERVER_MAC_DFLT
 Kill the current agent (given by the
 .Ev SSH_AGENT_PID
 diff -pur old/ssh-agent.c new/ssh-agent.c
 --- old/ssh-agent.c
 +++ new/ssh-agent.c
-@@ -1199,6 +1199,7 @@ main(int ac, char **av)
+@@ -1196,6 +1196,7 @@ main(int ac, char **av)
 	struct timeval *tvp = NULL;
 	size_t len;
 	mode_t prev_mask;
 +	int fips_err;
 	ssh_malloc_init();	/* must be called before any mallocs */
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
-@@ -1213,6 +1214,9 @@ main(int ac, char **av)
+@@ -1207,6 +1208,9 @@ main(int ac, char **av)
-	prctl(PR_SET_DUMPABLE, 0);
-#endif
+	platform_disable_tracing(0);	/* strict=no */
 +#ifdef ENABLE_OPENSSL_FIPS
 +	fips_err = ssh_FIPS_mode_set_if_capable();
 +#endif
 #ifdef WITH_OPENSSL
 	OpenSSL_add_all_algorithms();
 #endif
-@@ -1343,8 +1347,19 @@ main(int ac, char **av)
+@@ -1337,8 +1341,19 @@ main(int ac, char **av)
 		printf(format, SSH_AUTHSOCKET_ENV_NAME, socket_name,
 		    SSH_AUTHSOCKET_ENV_NAME);
 		printf("echo Agent pid %ld;\n", (long)parent_pid);
 +#ifdef ENABLE_OPENSSL_FIPS
 +		ssh_FIPS_check_status();
 	pid = fork();
 	if (pid == -1) {
 diff -pur old/ssh-keygen.1 new/ssh-keygen.1
 --- old/ssh-keygen.1
 +++ new/ssh-keygen.1
-@@ -283,6 +283,8 @@ and
+@@ -284,6 +284,8 @@ and
 .Dq sha256 .
 The default is
 .Dq sha256 .
 +If OpenSSL is running in FIPS-140 mode, the only supported option is
 +.Dq sha256 .
 This option will read a private or public OpenSSH key file and
 print to stdout the key in one of the formats specified by the
 diff -pur old/ssh-keygen.c new/ssh-keygen.c
 --- old/ssh-keygen.c
 +++ new/ssh-keygen.c
-@@ -2267,11 +2267,18 @@ main(int argc, char **argv)
+@@ -2273,11 +2273,18 @@ main(int argc, char **argv)
 	__progname = ssh_get_progname(argv[0]);
 +#ifdef ENABLE_OPENSSL_FIPS
 +	ssh_FIPS_mode_set_if_capable();
 	OpenSSL_add_all_algorithms();
 	arc4random_buf(rnd, sizeof(rnd));
 diff -pur old/ssh.1 new/ssh.1
 --- old/ssh.1
 +++ new/ssh.1
-@@ -91,6 +91,9 @@ If
+@@ -92,6 +92,9 @@ If
 is specified,
 it is executed on the remote host instead of a login shell.
 .Pp
 +If ssh links with FIPS-capable OpenSSL, ssh runs in FIPS-140 mode.
 +In FIPS-140 mode non-FIPS approved ciphers, MACs and digests are disabled.
 .Pp
 .Bl -tag -width Ds -compact
 diff -pur old/ssh.c new/ssh.c
 --- old/ssh.c
 +++ new/ssh.c
-@@ -606,6 +606,11 @@ main(int ac, char **av)
+@@ -609,6 +609,11 @@ main(int ac, char **av)
 	 */
 	initialize_options(&options);
 +#ifdef ENABLE_OPENSSL_FIPS
 +	/* determine FIPS mode early to limit ciphers and macs */
 +#endif
 +
 	/* Parse command-line arguments. */
 	host = NULL;
 	use_syslog = 0;
-@@ -1016,6 +1021,10 @@ main(int ac, char **av)
+@@ -1028,6 +1033,10 @@ main(int ac, char **av)
 #endif
 		);
 +#ifdef ENABLE_OPENSSL_FIPS
 +	ssh_FIPS_check_status();
 	process_config_files(host_arg, pw, 0);
 diff -pur old/ssh_api.c new/ssh_api.c
 --- old/ssh_api.c
 +++ new/ssh_api.c
-@@ -81,6 +81,10 @@ ssh_init(struct ssh **sshp, int is_serve
+@@ -79,6 +79,10 @@ ssh_init(struct ssh **sshp, int is_serve
 	int r;
 	if (!called) {
 +#ifdef ENABLE_OPENSSL_FIPS
 +		ssh_FIPS_mode_set_if_capable();
 +In FIPS-140 mode the only supported option is
 +.Dq sha256 .
 .It Cm ForwardAgent
 Specifies whether the connection to the authentication agent (if any)
 will be forwarded to the remote machine.
-@@ -1200,6 +1209,16 @@ [email protected],[email protected]
+@@ -1249,6 +1258,16 @@ [email protected],[email protected]
 hmac-sha2-256,hmac-sha2-512,hmac-sha1
 .Ed
 .Pp
 +The following MACs are FIPS-140 approved and are supported in FIPS-140 mode:
 +.Bd -literal -offset indent
 .Bl -tag -width Ds
 .It Fl 4
 diff -pur old/sshd.c new/sshd.c
 --- old/sshd.c
 +++ new/sshd.c
-@@ -430,10 +430,18 @@ sshd_exchange_identification(int sock_in
+@@ -431,10 +431,18 @@ sshd_exchange_identification(struct ssh
 		minor = PROTOCOL_MINOR_1;
 	}
 +#ifdef ENABLE_OPENSSL_FIPS
 +	xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
 	    options.version_addendum, newline);
 +#endif
 	/* Send our protocol version identification. */
 	if (atomicio(vwrite, sock_out, server_version_string,
-@@ -1503,6 +1511,10 @@ main(int ac, char **av)
+@@ -1562,6 +1570,10 @@ main(int ac, char **av)
 	/* Ensure that fds 0, 1 and 2 are open or directed to /dev/null */
 	sanitise_stdfd();
 +#ifdef ENABLE_OPENSSL_FIPS
 +	ssh_FIPS_mode_set_if_capable();
 +#endif
 +
 	/* Initialize configuration options to their default values. */
 	initialize_server_options(&options);
-@@ -1653,6 +1665,10 @@ main(int ac, char **av)
+@@ -1712,6 +1724,10 @@ main(int ac, char **av)
 	    SYSLOG_FACILITY_AUTH : options.log_facility,
 	    log_stderr || !inetd_flag);
 +#ifdef ENABLE_OPENSSL_FIPS
 +	ssh_FIPS_check_status();
 	 * Unset KRB5CCNAME, otherwise the user's session may inherit it from
 	 * root's environment
 diff -pur old/sshd_config.5 new/sshd_config.5
 --- old/sshd_config.5
 +++ new/sshd_config.5
-@@ -482,6 +482,13 @@ aes128-ctr,aes192-ctr,aes256-ctr,
+@@ -489,6 +489,13 @@ aes128-ctr,aes192-ctr,aes256-ctr,
 [email protected],[email protected]
 .Ed
 .Pp
 +The following ciphers are FIPS-140 approved and are supported in FIPS-140 mode:
 +.Bd -literal -offset indent
 +.Ed
 +.Pp
 The list of available ciphers may also be obtained using the
 .Fl Q
 option of
-@@ -576,6 +583,8 @@ and
+@@ -585,6 +592,8 @@ and
 .Dq sha256 .
 The default is
 .Dq sha256 .
 +In FIPS-140 mode the only supported option is
 +.Dq sha256 .
 .It Cm ForceCommand
 Forces the execution of the command specified by
 .Cm ForceCommand ,
-@@ -1025,6 +1034,16 @@ [email protected],[email protected]
+@@ -1034,6 +1043,16 @@ [email protected],[email protected]
 hmac-sha2-256,hmac-sha2-512,hmac-sha1
 .Ed
 .Pp
 +The following MACs are FIPS-140 approved and are supported in FIPS-140 mode:
 +.Bd -literal -offset indent

changeset 6930	31ef2580c45d
parent 5819	c5f05bd2a9bc
child 7649	69d7508f0d66