diff -up openssh-6.6p1/Makefile.in.fips openssh-6.6p1/Makefile.in

--- openssh-6.6p1/Makefile.in.fips	2015-08-13 15:09:43.343350136 +0200

+++ openssh-6.6p1/Makefile.in	2015-08-13 15:09:43.356350114 +0200

@@ -154,25 +154,25 @@ libssh.a: $(LIBSSH_OBJS)

 	$(RANLIB) $@

 ssh$(EXEEXT): $(LIBCOMPAT) libssh.a $(SSHOBJS)

-	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHLIBS) $(LIBS) $(GSSLIBS)

+	$(LD) -o $@ $(SSHOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(SSHLIBS) $(LIBS) $(GSSLIBS)

 sshd$(EXEEXT): libssh.a	$(LIBCOMPAT) $(SSHDOBJS)

-	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)

+	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(SSHDLIBS) $(LIBS) $(GSSLIBS) $(K5LIBS)

 scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o

 	$(LD) -o $@ scp.o progressmeter.o bufaux.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

 ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o

-	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

+	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)

 ssh-agent$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-agent.o ssh-pkcs11-client.o

-	$(LD) -o $@ ssh-agent.o ssh-pkcs11-client.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

+	$(LD) -o $@ ssh-agent.o ssh-pkcs11-client.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)

 ssh-keygen$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keygen.o

-	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

+	$(LD) -o $@ ssh-keygen.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)

 ssh-keysign$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keysign.o roaming_dummy.o readconf.o

-	$(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

+	$(LD) -o $@ ssh-keysign.o readconf.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lfipscheck $(LIBS)

 ssh-pkcs11-helper$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-pkcs11-helper.o ssh-pkcs11.o

 	$(LD) -o $@ ssh-pkcs11-helper.o ssh-pkcs11.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lopenbsd-compat $(LIBS)

@@ -187,7 +187,7 @@ ctr-cavstest$(EXEEXT): $(LIBCOMPAT) libs

 	$(LD) -o $@ ctr-cavstest.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS)

 ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o roaming_dummy.o

-	$(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)

+	$(LD) -o $@ ssh-keyscan.o roaming_dummy.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh -lfipscheck $(LIBS)

 sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o sftp-server-main.o

 	$(LD) -o $@ sftp-server.o sftp-common.o sftp-server-main.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)

diff -up openssh-6.6p1/auth-rsa.c.fips openssh-6.6p1/auth-rsa.c

--- openssh-6.6p1/auth-rsa.c.fips	2015-08-13 15:09:43.344350134 +0200

+++ openssh-6.6p1/auth-rsa.c	2015-08-13 15:09:43.354350118 +0200

@@ -244,7 +244,7 @@ rsa_key_allowed_in_file(struct passwd *p

 			    "actual %d vs. announced %d.",

 			    file, linenum, BN_num_bits(key->rsa->n), bits);

-		fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);

+		fp = key_selected_fingerprint(key, SSH_FP_HEX);

 		debug("matching key found: file %s, line %lu %s %s",

 		    file, linenum, key_type(key), fp);

 		free(fp);

diff -up openssh-6.6p1/auth2-pubkey.c.fips openssh-6.6p1/auth2-pubkey.c

diff -up openssh-6.6p1/authfile.c.fips openssh-6.6p1/authfile.c

--- openssh-6.6p1/authfile.c.fips	2016-06-27 09:51:39.334362038 +0200

+++ openssh-6.6p1/authfile.c	2016-06-27 09:51:39.443361948 +0200

@@ -46,6 +46,7 @@

 #include <openssl/err.h>

 #include <openssl/evp.h>

 #include <openssl/pem.h>

+#include <openssl/fips.h>

 /* compatibility with old or broken OpenSSL versions */

 #include "openbsd-compat/openssl-compat.h"

@@ -1008,7 +1009,10 @@ key_parse_private_type(Buffer *blob, int

 	switch (type) {

 	case KEY_RSA1:

-		return key_parse_private_rsa1(blob, passphrase, commentp);

+		if (! FIPS_mode())

+			return key_parse_private_rsa1(blob, passphrase, commentp);

+		error("%s: cannot parse rsa1 key in FIPS mode", __func__);

+		break;

 	case KEY_DSA:

 	case KEY_ECDSA:

 	case KEY_RSA:

@@ -1068,7 +1072,7 @@ Key *

 key_parse_private(Buffer *buffer, const char *filename,

     const char *passphrase, char **commentp)

 {

-	Key *pub, *prv;

+	Key *pub, *prv = NULL;

 	/* it's a SSH v1 key if the public key part is readable */

 	pub = key_parse_public_rsa1(buffer, commentp);

@@ -1080,9 +1084,10 @@ key_parse_private(Buffer *buffer, const

 			*commentp = xstrdup(filename);

 	} else {

 		key_free(pub);

-		/* key_parse_public_rsa1() has already loaded the comment */

-		prv = key_parse_private_type(buffer, KEY_RSA1, passphrase,

-		    NULL);

+		if (! FIPS_mode())

+			/* key_parse_public_rsa1() has already loaded the comment */

+			prv = key_parse_private_type(buffer, KEY_RSA1, passphrase,

+			    NULL);

 	}

 	return prv;

 }

diff -up openssh-6.6p1/cipher-ctr.c.fips openssh-6.6p1/cipher-ctr.c

--- openssh-6.6p1/cipher-ctr.c.fips	2015-08-13 15:09:43.254350286 +0200

+++ openssh-6.6p1/cipher-ctr.c	2015-08-13 15:09:43.354350118 +0200

@@ -179,7 +179,8 @@ evp_aes_128_ctr(void)

 	aes_ctr.do_cipher = ssh_aes_ctr;

 #ifndef SSH_OLD_EVP

 	aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH |

-	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV;

+	    EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV |

+	    EVP_CIPH_FLAG_FIPS;

 #endif

 	return (&aes_ctr);

 }

diff -up openssh-6.6p1/cipher.c.fips openssh-6.6p1/cipher.c

--- openssh-6.6p1/cipher.c.fips	2015-08-13 15:09:43.345350133 +0200

+++ openssh-6.6p1/cipher.c	2015-08-13 15:09:43.354350118 +0200

@@ -39,6 +39,8 @@

 #include <sys/types.h>

+#include <openssl/fips.h>

+

 #include <string.h>

 #include <stdarg.h>

 #include <stdio.h>

@@ -90,6 +92,25 @@ static const struct Cipher ciphers[] = {

 	{ NULL,		SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL }

 };

+static const struct Cipher fips_ciphers[] = {

+	{ "none",	SSH_CIPHER_NONE, 8, 0, 0, 0, 0, 0, EVP_enc_null },

+	{ "3des-cbc",	SSH_CIPHER_SSH2, 8, 24, 0, 0, 0, 1, EVP_des_ede3_cbc },

+	{ "aes128-cbc",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 1, EVP_aes_128_cbc },

+	{ "aes192-cbc",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 1, EVP_aes_192_cbc },

+	{ "aes256-cbc",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },

+	{ "rijndael-cbc@lysator.liu.se",

+			SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 1, EVP_aes_256_cbc },

+	{ "aes128-ctr",	SSH_CIPHER_SSH2, 16, 16, 0, 0, 0, 0, EVP_aes_128_ctr },

+	{ "aes192-ctr",	SSH_CIPHER_SSH2, 16, 24, 0, 0, 0, 0, EVP_aes_192_ctr },

+	{ "aes256-ctr",	SSH_CIPHER_SSH2, 16, 32, 0, 0, 0, 0, EVP_aes_256_ctr },

+#ifdef OPENSSL_HAVE_EVPGCM

+	{ "aes128-gcm@openssh.com",

+			SSH_CIPHER_SSH2, 16, 16, 12, 16, 0, 0, EVP_aes_128_gcm },

+	{ "aes256-gcm@openssh.com",

+			SSH_CIPHER_SSH2, 16, 32, 12, 16, 0, 0, EVP_aes_256_gcm },

+#endif

+	{ NULL,		SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL }

+};

 /*--*/

 /* Returns a list of supported ciphers separated by the specified char. */

@@ -100,7 +121,7 @@ cipher_alg_list(char sep, int auth_only)

 	size_t nlen, rlen = 0;

 	const Cipher *c;

-	for (c = ciphers; c->name != NULL; c++) {

+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) {

 		if (c->number != SSH_CIPHER_SSH2)

 			continue;

 		if (auth_only && c->auth_len == 0)

@@ -180,7 +201,7 @@ const Cipher *

 cipher_by_name(const char *name)

 {

 	const Cipher *c;

-	for (c = ciphers; c->name != NULL; c++)

+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)

 		if (strcmp(c->name, name) == 0)

 			return c;

 	return NULL;

@@ -190,7 +211,7 @@ const Cipher *

 cipher_by_number(int id)

 {

 	const Cipher *c;

-	for (c = ciphers; c->name != NULL; c++)

+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)

 		if (c->number == id)

 			return c;

 	return NULL;

@@ -232,7 +253,7 @@ cipher_number(const char *name)

 	const Cipher *c;

 	if (name == NULL)

 		return -1;

-	for (c = ciphers; c->name != NULL; c++)

+	for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++)

 		if (strcasecmp(c->name, name) == 0)

 			return c->number;

 	return -1;

diff -up openssh-6.6p1/dh.h.fips openssh-6.6p1/dh.h

--- openssh-6.6p1/dh.h.fips	2013-10-10 01:32:40.000000000 +0200

+++ openssh-6.6p1/dh.h	2015-08-13 15:09:43.354350118 +0200

@@ -45,6 +45,7 @@ int	 dh_estimate(int);

 /* Min and max values from RFC4419. */

 #define DH_GRP_MIN	1024

+#define DH_GRP_MIN_FIPS	2048

 #define DH_GRP_MAX	8192

 /*

diff -up openssh-6.6p1/entropy.c.fips openssh-6.6p1/entropy.c

--- openssh-6.6p1/entropy.c.fips	2015-08-13 15:09:43.238350313 +0200

+++ openssh-6.6p1/entropy.c	2015-08-13 15:09:43.355350116 +0200

@@ -222,6 +222,9 @@ seed_rng(void)

 		fatal("OpenSSL version mismatch. Built against %lx, you "

 		    "have %lx", (u_long)OPENSSL_VERSION_NUMBER, SSLeay());

+	/* clean the PRNG status when exiting the program */

+	atexit(RAND_cleanup);

+

 #ifndef OPENSSL_PRNG_ONLY

 	if (RAND_status() == 1) {

 		debug3("RNG is ready, skipping seeding");

diff -up openssh-6.6p1/kex.c.fips openssh-6.6p1/kex.c

--- openssh-6.6p1/kex.c.fips	2015-08-13 15:09:43.350350124 +0200

+++ openssh-6.6p1/kex.c	2015-08-13 15:09:43.355350116 +0200

@@ -34,6 +34,7 @@

 #include <string.h>

 #include <openssl/crypto.h>

+#include <openssl/fips.h>

 #include "xmalloc.h"

 #include "ssh2.h"

@@ -103,6 +104,25 @@ static const struct kexalg kexalgs[] = {

 	{ NULL, -1, -1, -1},

 };

+static const struct kexalg kexalgs_fips[] = {

+	{ KEX_DH14, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 },

+	{ 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

+#ifdef OPENSSL_HAS_ECC

+	{ KEX_ECDH_SHA2_NISTP256, KEX_ECDH_SHA2,

+	    NID_X9_62_prime256v1, SSH_DIGEST_SHA256 },

+	{ KEX_ECDH_SHA2_NISTP384, KEX_ECDH_SHA2, NID_secp384r1,

+	    SSH_DIGEST_SHA384 },

+# ifdef OPENSSL_HAS_NISTP521

+	{ KEX_ECDH_SHA2_NISTP521, KEX_ECDH_SHA2, NID_secp521r1,

+	    SSH_DIGEST_SHA512 },

+# endif

+#endif

+	{ NULL, -1, -1, NULL},

+};

+

 char *

 kex_alg_list(char sep)

 {

@@ -126,7 +146,7 @@ kex_alg_by_name(const char *name)

 {

 	const struct kexalg *k;

-	for (k = kexalgs; k->name != NULL; k++) {

+	for (k = (FIPS_mode() ? kexalgs_fips : kexalgs); k->name != NULL; k++) {

 		if (strcmp(k->name, name) == 0)

 			return k;

 #ifdef GSSAPI

@@ -151,7 +171,10 @@ kex_names_valid(const char *names)

 	for ((p = strsep(&cp, ",")); p && *p != '\0';

 	    (p = strsep(&cp, ","))) {

 		if (kex_alg_by_name(p) == NULL) {

-			error("Unsupported KEX algorithm \"%.100s\"", p);

+			if (FIPS_mode())

+				error("\"%.100s\" is not allowed in FIPS mode", p);

+			else

+				error("Unsupported KEX algorithm \"%.100s\"", p);

 			free(s);

 			return 0;

 		}

diff -up openssh-6.6p1/kexecdhc.c.fips openssh-6.6p1/kexecdhc.c

--- openssh-6.6p1/kexecdhc.c.fips	2014-02-04 01:20:15.000000000 +0100

+++ openssh-6.6p1/kexecdhc.c	2015-08-13 15:09:43.355350116 +0200

@@ -154,6 +154,7 @@ kexecdh_client(Kex *kex)

 	kex_derive_keys_bn(kex, hash, hashlen, shared_secret);

 	BN_clear_free(shared_secret);

+	memset(hash, 0, hashlen);

 	kex_finish(kex);

 }

 #else /* OPENSSL_HAS_ECC */

diff -up openssh-6.6p1/kexecdhs.c.fips openssh-6.6p1/kexecdhs.c

--- openssh-6.6p1/kexecdhs.c.fips	2014-02-04 01:20:15.000000000 +0100

+++ openssh-6.6p1/kexecdhs.c	2015-08-13 15:09:43.355350116 +0200

@@ -150,6 +150,7 @@ kexecdh_server(Kex *kex)

 	kex_derive_keys_bn(kex, hash, hashlen, shared_secret);

 	BN_clear_free(shared_secret);

+	memset(hash, 0, hashlen);

 	kex_finish(kex);

 }

 #else /* OPENSSL_HAS_ECC */

diff -up openssh-6.6p1/kexgexc.c.fips openssh-6.6p1/kexgexc.c

--- openssh-6.6p1/kexgexc.c.fips	2014-02-04 01:20:15.000000000 +0100

+++ openssh-6.6p1/kexgexc.c	2015-08-13 15:09:43.355350116 +0200

@@ -26,6 +26,8 @@

 #include "includes.h"

+#include <openssl/fips.h>

+

 #include <sys/types.h>

 #include <openssl/dh.h>

@@ -64,13 +66,13 @@ kexgex_client(Kex *kex)

 		/* Old GEX request */

 		packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST_OLD);

 		packet_put_int(nbits);

-		min = DH_GRP_MIN;

+		min = FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN;

 		max = DH_GRP_MAX;

 		debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD(%u) sent", nbits);

 	} else {

 		/* New GEX request */

-		min = DH_GRP_MIN;

+		min = FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN;

 		max = DH_GRP_MAX;

 		packet_start(SSH2_MSG_KEX_DH_GEX_REQUEST);

 		packet_put_int(min);

diff -up openssh-6.6p1/kexgexs.c.fips openssh-6.6p1/kexgexs.c

--- openssh-6.6p1/kexgexs.c.fips	2014-02-04 01:20:15.000000000 +0100

+++ openssh-6.6p1/kexgexs.c	2015-08-13 15:09:43.355350116 +0200

@@ -76,16 +76,16 @@ kexgex_server(Kex *kex)

 		omin = min = packet_get_int();

 		onbits = nbits = packet_get_int();

 		omax = max = packet_get_int();

-		min = MAX(DH_GRP_MIN, min);

+		min = MAX(FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN, min);

 		max = MIN(DH_GRP_MAX, max);

-		nbits = MAX(DH_GRP_MIN, nbits);

+		nbits = MAX(FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN, nbits);

 		nbits = MIN(DH_GRP_MAX, nbits);

 		break;

 	case SSH2_MSG_KEX_DH_GEX_REQUEST_OLD:

 		debug("SSH2_MSG_KEX_DH_GEX_REQUEST_OLD received");

 		onbits = nbits = packet_get_int();

 		/* unused for old GEX */

-		omin = min = DH_GRP_MIN;

+		omin = min = FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN;

 		omax = max = DH_GRP_MAX;

 		break;

 	default:

diff -up openssh-6.6p1/key.c.fips openssh-6.6p1/key.c

--- openssh-6.6p1/key.c.fips	2015-08-13 15:09:43.345350133 +0200

+++ openssh-6.6p1/key.c	2015-08-13 15:09:43.356350114 +0200

@@ -42,6 +42,7 @@

 #include "crypto_api.h"

 #include <openssl/evp.h>

+#include <openssl/fips.h>

 #include <openbsd-compat/openssl-compat.h>

 #include <stdarg.h>

@@ -635,7 +636,7 @@ sshkey_format_oneline(const struct sshke

 	char *fp, *result;

 	if (key_is_cert(key)) {

-		fp = key_fingerprint(key->cert->signature_key, SSH_FP_MD5,

+		fp = key_selected_fingerprint(key->cert->signature_key,

 		    SSH_FP_HEX);

 		xasprintf(&result, "%s ID %s (serial %llu) CA %s %s",

 		    key_type(key), key->cert->key_id,

@@ -644,7 +645,7 @@ sshkey_format_oneline(const struct sshke

 		    fp == NULL ? "(null)" : fp);

 		free(fp);

 	} else {

-		fp = key_fingerprint(key, SSH_FP_MD5, SSH_FP_HEX);

+		fp = key_selected_fingerprint(key, SSH_FP_HEX);

 		xasprintf(&result, "%s %s", key_type(key),

 		    fp == NULL ? "(null)" : fp);

 		free(fp);

@@ -661,9 +662,13 @@ key_fingerprint_selection(void)

 	char *env;

 	if (!rv_defined) {

-		env = getenv("SSH_FINGERPRINT_TYPE");

-		rv = (env && !strcmp (env, "sha")) ?

-			SSH_FP_SHA1 : SSH_FP_MD5;

+		if (FIPS_mode())

+			rv = SSH_FP_SHA1;

+		else {

+			env = getenv("SSH_FINGERPRINT_TYPE");

+			rv = (env && !strcmp (env, "sha")) ?

+				SSH_FP_SHA1 : SSH_FP_MD5;

+		}

 		rv_defined = 1;

 	}

 	return rv;

@@ -1168,8 +1173,11 @@ rsa_generate_private_key(u_int bits)

 		fatal("%s: BN_new failed", __func__);

 	if (!BN_set_word(f4, RSA_F4))

 		fatal("%s: BN_new failed", __func__);

-	if (!RSA_generate_key_ex(private, bits, f4, NULL))

+	if (!RSA_generate_key_ex(private, bits, f4, NULL)) {

+		if (FIPS_mode())

+			logit("%s: the key length might be unsupported by FIPS mode approved key generation method", __func__);

 		fatal("%s: key generation failed.", __func__);

+	}

 	BN_free(f4);

 	return private;

 }

diff -up openssh-6.6p1/mac.c.fips openssh-6.6p1/mac.c

--- openssh-6.6p1/mac.c.fips	2015-08-13 15:09:43.346350131 +0200

+++ openssh-6.6p1/mac.c	2015-08-13 15:09:43.356350114 +0200

@@ -27,6 +27,8 @@

 #include <sys/types.h>

+#include <openssl/fips.h>

+

 #include <stdarg.h>

 #include <string.h>

 #include <signal.h>

@@ -60,7 +62,7 @@ struct macalg {

 	int		etm;		/* Encrypt-then-MAC */

 };

-static const struct macalg macs[] = {

+static const struct macalg all_macs[] = {

 	/* Encrypt-and-MAC (encrypt-and-authenticate) variants */

 	{ "hmac-sha1",				SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 0 },

 	{ "hmac-sha1-96",			SSH_DIGEST, SSH_DIGEST_SHA1, 96, 0, 0, 0 },

@@ -91,6 +93,24 @@ static const struct macalg macs[] = {

 	{ NULL,					0, 0, 0, 0, 0, 0 }

 };

+static const struct macalg fips_macs[] = {

+	/* Encrypt-and-MAC (encrypt-and-authenticate) variants */

+	{ "hmac-sha1",				SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 0 },

+#ifdef HAVE_EVP_SHA256

+	{ "hmac-sha2-256",			SSH_DIGEST, SSH_DIGEST_SHA256, 0, 0, 0, 0 },

+	{ "hmac-sha2-512",			SSH_DIGEST, SSH_DIGEST_SHA512, 0, 0, 0, 0 },

+#endif

+

+	/* Encrypt-then-MAC variants */

+	{ "hmac-sha1-etm@openssh.com",		SSH_DIGEST, SSH_DIGEST_SHA1, 0, 0, 0, 1 },

+#ifdef HAVE_EVP_SHA256

+	{ "hmac-sha2-256-etm@openssh.com",	SSH_DIGEST, SSH_DIGEST_SHA256, 0, 0, 0, 1 },

+	{ "hmac-sha2-512-etm@openssh.com",	SSH_DIGEST, SSH_DIGEST_SHA512, 0, 0, 0, 1 },

+#endif

+

+	{ NULL,					0, 0, 0, 0, 0, 0 }

+};

+

 /* Returns a list of supported MACs separated by the specified char. */

 char *

 mac_alg_list(char sep)

@@ -99,7 +119,7 @@ mac_alg_list(char sep)

 	size_t nlen, rlen = 0;

 	const struct macalg *m;

-	for (m = macs; m->name != NULL; m++) {

+	for (m = FIPS_mode() ? fips_macs : all_macs; m->name != NULL; m++) {

 		if (ret != NULL)

 			ret[rlen++] = sep;

 		nlen = strlen(m->name);

@@ -133,7 +153,7 @@ mac_setup(Mac *mac, char *name)

 {

 	const struct macalg *m;

-	for (m = macs; m->name != NULL; m++) {

+	for (m = FIPS_mode() ? fips_macs : all_macs; m->name != NULL; m++) {

 		if (strcmp(name, m->name) != 0)

 			continue;

 		if (mac != NULL) {

diff -up openssh-6.6p1/myproposal.h.fips openssh-6.6p1/myproposal.h

--- openssh-6.6p1/myproposal.h.fips	2013-12-07 01:24:02.000000000 +0100

+++ openssh-6.6p1/myproposal.h	2015-08-13 15:10:30.288271102 +0200

@@ -88,6 +88,12 @@

 	"diffie-hellman-group14-sha1," \

 	"diffie-hellman-group1-sha1"

+#define KEX_DEFAULT_KEX_FIPS		\

+	KEX_ECDH_METHODS \

+	KEX_SHA256_METHODS \

+	"diffie-hellman-group-exchange-sha1," \

+	"diffie-hellman-group14-sha1"

+

 #define	KEX_DEFAULT_PK_ALG	\

 	HOSTKEY_ECDSA_CERT_METHODS \

 	"ssh-ed25519-cert-v01@openssh.com," \

@@ -133,6 +139,22 @@

 #define	KEX_DEFAULT_COMP	"none,zlib@openssh.com,zlib"

 #define	KEX_DEFAULT_LANG	""

+#define	KEX_FIPS_ENCRYPT \

+	"aes128-ctr,aes192-ctr,aes256-ctr," \

+	"aes128-cbc,3des-cbc," \

+	"aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se"

+#ifdef HAVE_EVP_SHA256

+#define	KEX_FIPS_MAC \

+	"hmac-sha1," \

+	"hmac-sha2-256," \

+	"hmac-sha2-512," \

+	"hmac-sha1-etm@openssh.com," \

+	"hmac-sha2-256-etm@openssh.com," \

+	"hmac-sha2-512-etm@openssh.com"

+#else

+#define        KEX_FIPS_MAC \

+       "hmac-sha1"

+#endif

 static char *myproposal[PROPOSAL_MAX] = {

 	KEX_DEFAULT_KEX,

diff -up openssh-6.6p1/ssh-keygen.c.fips openssh-6.6p1/ssh-keygen.c

--- openssh-6.6p1/ssh-keygen.c.fips	2015-08-13 15:09:43.296350215 +0200

+++ openssh-6.6p1/ssh-keygen.c	2015-08-13 15:09:43.360350107 +0200

@@ -195,6 +195,12 @@ type_bits_valid(int type, u_int32_t *bit

 		fprintf(stderr, "key bits exceeds maximum %d\n", maxbits);

 		exit(1);

 	}

+	if (FIPS_mode()) {

+		if (type == KEY_DSA)

+			fatal("DSA keys are not allowed in FIPS mode");

+		if (type == KEY_ED25519)

+			fatal("ED25519 keys are not allowed in FIPS mode");

+	}

 	if (type == KEY_DSA && *bitsp != 1024)

 		fatal("DSA keys must be 1024 bits");

 	else if (type != KEY_ECDSA && type != KEY_ED25519 && *bitsp < 768)

@@ -746,7 +752,7 @@ do_download(struct passwd *pw)

 	enum fp_type fptype;

 	char *fp, *ra;

-	fptype = print_bubblebabble ? SSH_FP_SHA1 : SSH_FP_MD5;

+	fptype = print_bubblebabble ? SSH_FP_SHA1 : key_fingerprint_selection();

 	rep =    print_bubblebabble ? SSH_FP_BUBBLEBABBLE : SSH_FP_HEX;

 	pkcs11_init(0);

@@ -756,8 +762,7 @@ do_download(struct passwd *pw)

 	for (i = 0; i < nkeys; i++) {

 		if (print_fingerprint) {

 			fp = key_fingerprint(keys[i], fptype, rep);

-			ra = key_fingerprint(keys[i], SSH_FP_MD5,

-			    SSH_FP_RANDOMART);

+			ra = key_selected_fingerprint(keys[i], SSH_FP_RANDOMART);

 			printf("%u %s %s (PKCS11 key)\n", key_size(keys[i]),

 			    fp, key_type(keys[i]));

 			if (log_level >= SYSLOG_LEVEL_VERBOSE)

diff -up openssh-6.6p1/ssh.c.fips openssh-6.6p1/ssh.c

--- openssh-6.6p1/ssh.c.fips	2014-02-27 00:17:13.000000000 +0100

+++ openssh-6.6p1/ssh.c	2015-08-13 15:09:43.357350112 +0200

@@ -73,6 +73,8 @@

 #include <openssl/evp.h>

 #include <openssl/err.h>

+#include <openssl/fips.h>

+#include <fipscheck.h>

 #include "openbsd-compat/openssl-compat.h"

 #include "openbsd-compat/sys-queue.h"

@@ -427,6 +429,13 @@ main(int ac, char **av)

 	sanitise_stdfd();

 	__progname = ssh_get_progname(av[0]);

+        SSLeay_add_all_algorithms();

+	if (access("/etc/system-fips", F_OK) == 0)

+		if (! FIPSCHECK_verify(NULL, NULL))

+			if (FIPS_mode())

+				fatal("FIPS integrity verification test failed.");

+			else

+				logit("FIPS integrity verification test failed.");

 #ifndef HAVE_SETPROCTITLE

 	/* Prepare for later setproctitle emulation */

@@ -504,6 +513,9 @@ main(int ac, char **av)

 	    "ACD:E:F:I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {

 		switch (opt) {

 		case '1':

+			if (FIPS_mode()) {

+				fatal("Protocol 1 not allowed in the FIPS mode.");

+			}

 			options.protocol = SSH_PROTO_1;

 			break;

 		case '2':

@@ -828,7 +840,6 @@ main(int ac, char **av)

 	host_arg = xstrdup(host);

-	OpenSSL_add_all_algorithms();

 	ERR_load_crypto_strings();

 	/* Initialize the command to execute on remote host. */

@@ -973,6 +984,10 @@ main(int ac, char **av)

 	seed_rng();

+	if (FIPS_mode()) {

+		logit("FIPS mode initialized");

+	}

+

 	if (options.user == NULL)

 		options.user = xstrdup(pw->pw_name);

@@ -1020,6 +1035,12 @@ main(int ac, char **av)

 	timeout_ms = options.connection_timeout * 1000;

+	if (FIPS_mode()) {

+		options.protocol &= SSH_PROTO_2;

+		if (options.protocol == 0)

+			fatal("Protocol 2 disabled by configuration but required in the FIPS mode.");

+	}

+

 	/* Open a connection to the remote host. */

 	if (ssh_connect(host, addrs, &hostaddr, options.port,

 	    options.address_family, options.connection_attempts,

diff -up openssh-6.6p1/sshconnect2.c.fips openssh-6.6p1/sshconnect2.c

--- openssh-6.6p1/sshconnect2.c.fips	2015-08-13 15:09:43.342350138 +0200

+++ openssh-6.6p1/sshconnect2.c	2015-08-13 15:09:43.357350112 +0200

@@ -46,6 +46,8 @@

 #include <vis.h>

 #endif

+#include <openssl/fips.h>

+

 #include "openbsd-compat/sys-queue.h"

 #include "xmalloc.h"

@@ -170,21 +172,26 @@ ssh_kex2(char *host, struct sockaddr *ho

 #ifdef GSSAPI

 	if (options.gss_keyex) {

-		/* Add the GSSAPI mechanisms currently supported on this 

-		 * client to the key exchange algorithm proposal */

-		orig = myproposal[PROPOSAL_KEX_ALGS];

-

-		if (options.gss_trust_dns)

-			gss_host = (char *)get_canonical_hostname(1);

-		else

-			gss_host = host;

-

-		gss = ssh_gssapi_client_mechanisms(gss_host,

-		    options.gss_client_identity, options.gss_kex_algorithms);

-		if (gss) {

-			debug("Offering GSSAPI proposal: %s", gss);

-			xasprintf(&myproposal[PROPOSAL_KEX_ALGS],

-			    "%s,%s", gss, orig);

+		if (FIPS_mode()) {

+			logit("Disabling GSSAPIKeyExchange. Not usable in FIPS mode");

+			options.gss_keyex = 0;

+		} else {

+			/* Add the GSSAPI mechanisms currently supported on this 

+			 * client to the key exchange algorithm proposal */

+			orig = myproposal[PROPOSAL_KEX_ALGS];

+

+			if (options.gss_trust_dns)

+				gss_host = (char *)get_canonical_hostname(1);

+			else

+				gss_host = host;

+

+			gss = ssh_gssapi_client_mechanisms(gss_host,

+			    options.gss_client_identity, options.gss_kex_algorithms);

+			if (gss) {

+				debug("Offering GSSAPI proposal: %s", gss);

+				xasprintf(&myproposal[PROPOSAL_KEX_ALGS],

+				    "%s,%s", gss, orig);

+			}

 		}

 	}

 #endif

@@ -196,6 +203,10 @@ ssh_kex2(char *host, struct sockaddr *ho

 	if (options.ciphers != NULL) {

 		myproposal[PROPOSAL_ENC_ALGS_CTOS] =

 		myproposal[PROPOSAL_ENC_ALGS_STOC] = options.ciphers;

+	} else if (FIPS_mode()) {

+		myproposal[PROPOSAL_ENC_ALGS_CTOS] =

+		myproposal[PROPOSAL_ENC_ALGS_STOC] = KEX_FIPS_ENCRYPT;

+

 	}

 	myproposal[PROPOSAL_ENC_ALGS_CTOS] =

 	    compat_cipher_proposal(myproposal[PROPOSAL_ENC_ALGS_CTOS]);

@@ -211,7 +222,11 @@ ssh_kex2(char *host, struct sockaddr *ho

 	if (options.macs != NULL) {

 		myproposal[PROPOSAL_MAC_ALGS_CTOS] =

 		myproposal[PROPOSAL_MAC_ALGS_STOC] = options.macs;

+	} else if (FIPS_mode()) {

+		myproposal[PROPOSAL_MAC_ALGS_CTOS] =

+		myproposal[PROPOSAL_MAC_ALGS_STOC] = KEX_FIPS_MAC;

 	}

+

 	if (options.hostkeyalgorithms != NULL)

 		myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =

 		    compat_pkalg_proposal(options.hostkeyalgorithms);

@@ -223,9 +238,11 @@ ssh_kex2(char *host, struct sockaddr *ho

 	}

 	if (options.kex_algorithms != NULL)

 		myproposal[PROPOSAL_KEX_ALGS] = options.kex_algorithms;

+	else if (FIPS_mode())

+		myproposal[PROPOSAL_KEX_ALGS] = KEX_DEFAULT_KEX_FIPS;

+

 	myproposal[PROPOSAL_KEX_ALGS] = compat_kex_proposal(

 	    myproposal[PROPOSAL_KEX_ALGS]);

-

 #ifdef GSSAPI

 	/* If we've got GSSAPI algorithms, then we also support the

 	 * 'null' hostkey, as a last resort */

diff -up openssh-6.6p1/sshd.c.fips openssh-6.6p1/sshd.c

--- openssh-6.6p1/sshd.c.fips	2015-08-13 15:09:43.352350121 +0200

+++ openssh-6.6p1/sshd.c	2015-08-13 15:09:43.359350109 +0200

@@ -75,6 +75,8 @@

 #include <openssl/dh.h>

 #include <openssl/bn.h>

 #include <openssl/rand.h>

+#include <openssl/fips.h>

+#include <fipscheck.h>

 #include "openbsd-compat/openssl-compat.h"

 #ifdef HAVE_SECUREWARE

@@ -1473,6 +1475,18 @@ main(int ac, char **av)

 #endif

 	__progname = ssh_get_progname(av[0]);

+        SSLeay_add_all_algorithms();

+	if (access("/etc/system-fips", F_OK) == 0)

+		if (! FIPSCHECK_verify(NULL, NULL)) {