New upstream release including: * Dropping entropy patch * Remove default support for MD5 fingerprints * Porting all the downstream patches and pam_ssh_agent_auth to new sshbuf and sshkey API * pam_ssh_agent_auth is no longer using MD5 fingerprints
706 lines
24 KiB
Diff
706 lines
24 KiB
Diff
diff -up openssh-7.7p1/cipher.c.fips openssh-7.7p1/cipher.c
|
|
--- openssh-7.7p1/cipher.c.fips 2018-08-08 10:08:40.814719906 +0200
|
|
+++ openssh-7.7p1/cipher.c 2018-08-08 10:08:40.821719965 +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,33 @@ static const struct sshcipher ciphers[]
|
|
{ NULL, 0, 0, 0, 0, 0, NULL }
|
|
};
|
|
|
|
+static const struct sshcipher fips_ciphers[] = {
|
|
+#ifdef WITH_OPENSSL
|
|
+ { "3des-cbc", 8, 24, 0, 0, CFLAG_CBC, EVP_des_ede3_cbc },
|
|
+ { "aes128-cbc", 16, 16, 0, 0, CFLAG_CBC, EVP_aes_128_cbc },
|
|
+ { "aes192-cbc", 16, 24, 0, 0, CFLAG_CBC, EVP_aes_192_cbc },
|
|
+ { "aes256-cbc", 16, 32, 0, 0, CFLAG_CBC, EVP_aes_256_cbc },
|
|
+ { "rijndael-cbc@lysator.liu.se",
|
|
+ 16, 32, 0, 0, CFLAG_CBC, EVP_aes_256_cbc },
|
|
+ { "aes128-ctr", 16, 16, 0, 0, 0, EVP_aes_128_ctr },
|
|
+ { "aes192-ctr", 16, 24, 0, 0, 0, EVP_aes_192_ctr },
|
|
+ { "aes256-ctr", 16, 32, 0, 0, 0, EVP_aes_256_ctr },
|
|
+# ifdef OPENSSL_HAVE_EVPGCM
|
|
+ { "aes128-gcm@openssh.com",
|
|
+ 16, 16, 12, 16, 0, EVP_aes_128_gcm },
|
|
+ { "aes256-gcm@openssh.com",
|
|
+ 16, 32, 12, 16, 0, EVP_aes_256_gcm },
|
|
+# endif /* OPENSSL_HAVE_EVPGCM */
|
|
+#else
|
|
+ { "aes128-ctr", 16, 16, 0, 0, CFLAG_AESCTR, NULL },
|
|
+ { "aes192-ctr", 16, 24, 0, 0, CFLAG_AESCTR, NULL },
|
|
+ { "aes256-ctr", 16, 32, 0, 0, CFLAG_AESCTR, NULL },
|
|
+#endif
|
|
+ { "none", 8, 0, 0, 0, CFLAG_NONE, NULL },
|
|
+
|
|
+ { NULL, 0, 0, 0, 0, 0, NULL }
|
|
+};
|
|
+
|
|
/*--*/
|
|
|
|
/* Returns a comma-separated list of supported ciphers. */
|
|
@@ -100,7 +129,7 @@ cipher_alg_list(char sep, int auth_only)
|
|
size_t nlen, rlen = 0;
|
|
const struct sshcipher *c;
|
|
|
|
- for (c = ciphers; c->name != NULL; c++) {
|
|
+ for (c = FIPS_mode() ? fips_ciphers : ciphers; c->name != NULL; c++) {
|
|
if ((c->flags & CFLAG_INTERNAL) != 0)
|
|
continue;
|
|
if (auth_only && c->auth_len == 0)
|
|
@@ -172,7 +201,7 @@ const struct sshcipher *
|
|
cipher_by_name(const char *name)
|
|
{
|
|
const struct sshcipher *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;
|
|
diff -up openssh-7.7p1/cipher-ctr.c.fips openssh-7.7p1/cipher-ctr.c
|
|
--- openssh-7.7p1/cipher-ctr.c.fips 2018-08-08 10:08:40.709719021 +0200
|
|
+++ openssh-7.7p1/cipher-ctr.c 2018-08-08 10:08:40.821719965 +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-7.7p1/clientloop.c.fips openssh-7.7p1/clientloop.c
|
|
--- openssh-7.7p1/clientloop.c.fips 2018-08-08 10:08:40.769719527 +0200
|
|
+++ openssh-7.7p1/clientloop.c 2018-08-08 10:08:40.822719973 +0200
|
|
@@ -1978,7 +1978,8 @@ key_accepted_by_hostkeyalgs(const struct
|
|
{
|
|
const char *ktype = sshkey_ssh_name(key);
|
|
const char *hostkeyalgs = options.hostkeyalgorithms != NULL ?
|
|
- options.hostkeyalgorithms : KEX_DEFAULT_PK_ALG;
|
|
+ options.hostkeyalgorithms : (FIPS_mode() ?
|
|
+ KEX_FIPS_PK_ALG : KEX_DEFAULT_PK_ALG);
|
|
|
|
if (key == NULL || key->type == KEY_UNSPEC)
|
|
return 0;
|
|
diff -up openssh-7.7p1/dh.h.fips openssh-7.7p1/dh.h
|
|
--- openssh-7.7p1/dh.h.fips 2018-04-02 07:38:28.000000000 +0200
|
|
+++ openssh-7.7p1/dh.h 2018-08-08 10:08:40.822719973 +0200
|
|
@@ -51,6 +51,7 @@ u_int dh_estimate(int);
|
|
* Miniumum increased in light of DH precomputation attacks.
|
|
*/
|
|
#define DH_GRP_MIN 2048
|
|
+#define DH_GRP_MIN_FIPS 2048
|
|
#define DH_GRP_MAX 8192
|
|
|
|
/*
|
|
diff -up openssh-7.7p1/entropy.c.fips openssh-7.7p1/entropy.c
|
|
--- openssh-7.7p1/entropy.c.fips 2018-08-08 10:08:40.698718928 +0200
|
|
+++ openssh-7.7p1/entropy.c 2018-08-08 10:08:40.822719973 +0200
|
|
@@ -217,6 +217,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-7.7p1/kex.c.fips openssh-7.7p1/kex.c
|
|
--- openssh-7.7p1/kex.c.fips 2018-08-08 10:08:40.815719915 +0200
|
|
+++ openssh-7.7p1/kex.c 2018-08-08 10:11:24.109081924 +0200
|
|
@@ -35,6 +35,7 @@
|
|
#ifdef WITH_OPENSSL
|
|
#include <openssl/crypto.h>
|
|
#include <openssl/dh.h>
|
|
+#include <openssl/fips.h>
|
|
#endif
|
|
|
|
#include "ssh2.h"
|
|
@@ -122,6 +123,26 @@ static const struct kexalg kexalgs[] = {
|
|
{ NULL, -1, -1, -1},
|
|
};
|
|
|
|
+static const struct kexalg kexalgs_fips[] = {
|
|
+ { 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 },
|
|
+#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, -1},
|
|
+};
|
|
+
|
|
char *
|
|
kex_alg_list(char sep)
|
|
{
|
|
@@ -129,7 +150,7 @@ kex_alg_list(char sep)
|
|
size_t nlen, rlen = 0;
|
|
const struct kexalg *k;
|
|
|
|
- for (k = kexalgs; k->name != NULL; k++) {
|
|
+ for (k = (FIPS_mode() ? kexalgs_fips : kexalgs); k->name != NULL; k++) {
|
|
if (ret != NULL)
|
|
ret[rlen++] = sep;
|
|
nlen = strlen(k->name);
|
|
@@ -149,7 +170,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
|
|
@@ -175,7 +196,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-7.7p1/kexgexc.c.fips openssh-7.7p1/kexgexc.c
|
|
--- openssh-7.7p1/kexgexc.c.fips 2018-04-02 07:38:28.000000000 +0200
|
|
+++ openssh-7.7p1/kexgexc.c 2018-08-08 10:08:40.822719973 +0200
|
|
@@ -28,6 +28,7 @@
|
|
|
|
#ifdef WITH_OPENSSL
|
|
|
|
+#include <openssl/fips.h>
|
|
#include <sys/types.h>
|
|
|
|
#include <openssl/dh.h>
|
|
@@ -63,7 +64,7 @@ kexgex_client(struct ssh *ssh)
|
|
|
|
nbits = dh_estimate(kex->dh_need * 8);
|
|
|
|
- kex->min = DH_GRP_MIN;
|
|
+ kex->min = FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN;
|
|
kex->max = DH_GRP_MAX;
|
|
kex->nbits = nbits;
|
|
if (datafellows & SSH_BUG_DHGEX_LARGE)
|
|
diff -up openssh-7.7p1/kexgexs.c.fips openssh-7.7p1/kexgexs.c
|
|
--- openssh-7.7p1/kexgexs.c.fips 2018-04-02 07:38:28.000000000 +0200
|
|
+++ openssh-7.7p1/kexgexs.c 2018-08-08 10:08:40.823719982 +0200
|
|
@@ -82,9 +82,9 @@ input_kex_dh_gex_request(int type, u_int
|
|
kex->nbits = nbits;
|
|
kex->min = min;
|
|
kex->max = max;
|
|
- min = MAXIMUM(DH_GRP_MIN, min);
|
|
+ min = MAXIMUM(FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN, min);
|
|
max = MINIMUM(DH_GRP_MAX, max);
|
|
- nbits = MAXIMUM(DH_GRP_MIN, nbits);
|
|
+ nbits = MAXIMUM(FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN, nbits);
|
|
nbits = MINIMUM(DH_GRP_MAX, nbits);
|
|
|
|
if (kex->max < kex->min || kex->nbits < kex->min ||
|
|
diff -up openssh-7.7p1/mac.c.fips openssh-7.7p1/mac.c
|
|
--- openssh-7.7p1/mac.c.fips 2018-08-08 10:08:40.815719915 +0200
|
|
+++ openssh-7.7p1/mac.c 2018-08-08 10:11:56.915352642 +0200
|
|
@@ -27,6 +27,8 @@
|
|
|
|
#include <sys/types.h>
|
|
|
|
+#include <openssl/fips.h>
|
|
+
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
|
|
@@ -54,7 +56,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 },
|
|
@@ -82,6 +84,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)
|
|
@@ -90,7 +110,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);
|
|
@@ -129,7 +149,7 @@ mac_setup(struct sshmac *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-7.7p1/Makefile.in.fips openssh-7.7p1/Makefile.in
|
|
--- openssh-7.7p1/Makefile.in.fips 2018-08-08 10:08:40.815719915 +0200
|
|
+++ openssh-7.7p1/Makefile.in 2018-08-08 10:08:40.823719982 +0200
|
|
@@ -179,25 +179,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 $(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 readconf.o uidswap.o
|
|
- $(LD) -o $@ ssh-keysign.o readconf.o uidswap.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
|
+ $(LD) -o $@ ssh-keysign.o readconf.o uidswap.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)
|
|
@@ -215,7 +215,7 @@ ssh-cavs$(EXEEXT): $(LIBCOMPAT) libssh.a
|
|
$(LD) -o $@ ssh-cavs.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
|
|
|
|
ssh-keyscan$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-keyscan.o
|
|
- $(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
|
|
+ $(LD) -o $@ ssh-keyscan.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-7.7p1/myproposal.h.fips openssh-7.7p1/myproposal.h
|
|
--- openssh-7.7p1/myproposal.h.fips 2018-04-02 07:38:28.000000000 +0200
|
|
+++ openssh-7.7p1/myproposal.h 2018-08-08 10:08:40.823719982 +0200
|
|
@@ -114,6 +114,14 @@
|
|
"rsa-sha2-256," \
|
|
"ssh-rsa"
|
|
|
|
+#define KEX_FIPS_PK_ALG \
|
|
+ HOSTKEY_ECDSA_CERT_METHODS \
|
|
+ "ssh-rsa-cert-v01@openssh.com," \
|
|
+ HOSTKEY_ECDSA_METHODS \
|
|
+ "rsa-sha2-512," \
|
|
+ "rsa-sha2-256," \
|
|
+ "ssh-rsa"
|
|
+
|
|
/* the actual algorithms */
|
|
|
|
#define KEX_SERVER_ENCRYPT \
|
|
@@ -137,6 +145,38 @@
|
|
|
|
#define KEX_CLIENT_MAC KEX_SERVER_MAC
|
|
|
|
+#define KEX_FIPS_ENCRYPT \
|
|
+ "aes128-ctr,aes192-ctr,aes256-ctr," \
|
|
+ "aes128-cbc,3des-cbc," \
|
|
+ "aes192-cbc,aes256-cbc,rijndael-cbc@lysator.liu.se" \
|
|
+ AESGCM_CIPHER_MODES
|
|
+#ifdef HAVE_EVP_SHA256
|
|
+# define KEX_DEFAULT_KEX_FIPS \
|
|
+ KEX_ECDH_METHODS \
|
|
+ KEX_SHA2_METHODS \
|
|
+ "diffie-hellman-group14-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
|
|
+# ifdef OPENSSL_HAS_NISTP521
|
|
+# define KEX_DEFAULT_KEX_FIPS \
|
|
+ "ecdh-sha2-nistp256," \
|
|
+ "ecdh-sha2-nistp384," \
|
|
+ "ecdh-sha2-nistp521"
|
|
+# else
|
|
+# define KEX_DEFAULT_KEX_FIPS \
|
|
+ "ecdh-sha2-nistp256," \
|
|
+ "ecdh-sha2-nistp384"
|
|
+# endif
|
|
+#define KEX_FIPS_MAC \
|
|
+ "hmac-sha1"
|
|
+#endif
|
|
+
|
|
#else /* WITH_OPENSSL */
|
|
|
|
#define KEX_SERVER_KEX \
|
|
diff -up openssh-7.7p1/readconf.c.fips openssh-7.7p1/readconf.c
|
|
--- openssh-7.7p1/readconf.c.fips 2018-08-08 10:08:40.769719527 +0200
|
|
+++ openssh-7.7p1/readconf.c 2018-08-08 10:08:40.824719990 +0200
|
|
@@ -2081,17 +2081,18 @@ fill_default_options(Options * options)
|
|
all_mac = mac_alg_list(',');
|
|
all_kex = kex_alg_list(',');
|
|
all_key = sshkey_alg_list(0, 0, 1, ',');
|
|
-#define ASSEMBLE(what, defaults, all) \
|
|
+#define ASSEMBLE(what, defaults, fips_defaults, all) \
|
|
do { \
|
|
if ((r = kex_assemble_names(&options->what, \
|
|
- defaults, all)) != 0) \
|
|
+ (FIPS_mode() ? fips_defaults : defaults), \
|
|
+ all)) != 0) \
|
|
fatal("%s: %s: %s", __func__, #what, ssh_err(r)); \
|
|
} while (0)
|
|
- ASSEMBLE(ciphers, KEX_SERVER_ENCRYPT, all_cipher);
|
|
- ASSEMBLE(macs, KEX_SERVER_MAC, all_mac);
|
|
- ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex);
|
|
- ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key);
|
|
- ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key);
|
|
+ ASSEMBLE(ciphers, KEX_SERVER_ENCRYPT, KEX_FIPS_ENCRYPT, all_cipher);
|
|
+ ASSEMBLE(macs, KEX_SERVER_MAC, KEX_FIPS_MAC, all_mac);
|
|
+ ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, KEX_DEFAULT_KEX_FIPS, all_kex);
|
|
+ ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, KEX_FIPS_PK_ALG, all_key);
|
|
+ ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, KEX_FIPS_PK_ALG, all_key);
|
|
#undef ASSEMBLE
|
|
free(all_cipher);
|
|
free(all_mac);
|
|
diff -up openssh-7.7p1/sandbox-seccomp-filter.c.fips openssh-7.7p1/sandbox-seccomp-filter.c
|
|
--- openssh-7.7p1/sandbox-seccomp-filter.c.fips 2018-08-08 10:08:40.794719737 +0200
|
|
+++ openssh-7.7p1/sandbox-seccomp-filter.c 2018-08-08 10:08:40.824719990 +0200
|
|
@@ -137,6 +137,9 @@ static const struct sock_filter preauth_
|
|
#ifdef __NR_open
|
|
SC_DENY(__NR_open, EACCES),
|
|
#endif
|
|
+#ifdef __NR_socket
|
|
+ SC_DENY(__NR_socket, EACCES),
|
|
+#endif
|
|
#ifdef __NR_openat
|
|
SC_DENY(__NR_openat, EACCES),
|
|
#endif
|
|
diff -up openssh-7.7p1/servconf.c.fips openssh-7.7p1/servconf.c
|
|
--- openssh-7.7p1/servconf.c.fips 2018-08-08 10:08:40.778719603 +0200
|
|
+++ openssh-7.7p1/servconf.c 2018-08-08 10:08:40.824719990 +0200
|
|
@@ -196,17 +196,18 @@ option_clear_or_none(const char *o)
|
|
all_mac = mac_alg_list(',');
|
|
all_kex = kex_alg_list(',');
|
|
all_key = sshkey_alg_list(0, 0, 1, ',');
|
|
-#define ASSEMBLE(what, defaults, all) \
|
|
+#define ASSEMBLE(what, defaults, fips_defaults, all) \
|
|
do { \
|
|
- if ((r = kex_assemble_names(&o->what, defaults, all)) != 0) \
|
|
+ if ((r = kex_assemble_names(&o->what, (FIPS_mode() \
|
|
+ ? fips_defaults : defaults), all)) != 0) \
|
|
fatal("%s: %s: %s", __func__, #what, ssh_err(r)); \
|
|
} while (0)
|
|
- ASSEMBLE(ciphers, KEX_SERVER_ENCRYPT, all_cipher);
|
|
- ASSEMBLE(macs, KEX_SERVER_MAC, all_mac);
|
|
- ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, all_kex);
|
|
- ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, all_key);
|
|
- ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, all_key);
|
|
- ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, all_key);
|
|
+ ASSEMBLE(ciphers, KEX_SERVER_ENCRYPT, KEX_FIPS_ENCRYPT, all_cipher);
|
|
+ ASSEMBLE(macs, KEX_SERVER_MAC, KEX_FIPS_MAC, all_mac);
|
|
+ ASSEMBLE(kex_algorithms, KEX_SERVER_KEX, KEX_DEFAULT_KEX_FIPS, all_kex);
|
|
+ ASSEMBLE(hostkeyalgorithms, KEX_DEFAULT_PK_ALG, KEX_FIPS_PK_ALG, all_key);
|
|
+ ASSEMBLE(hostbased_key_types, KEX_DEFAULT_PK_ALG, KEX_FIPS_PK_ALG, all_key);
|
|
+ ASSEMBLE(pubkey_key_types, KEX_DEFAULT_PK_ALG, KEX_FIPS_PK_ALG, all_key);
|
|
#undef ASSEMBLE
|
|
free(all_cipher);
|
|
free(all_mac);
|
|
diff -up openssh-7.7p1/ssh.c.fips openssh-7.7p1/ssh.c
|
|
--- openssh-7.7p1/ssh.c.fips 2018-08-08 10:08:40.811719881 +0200
|
|
+++ openssh-7.7p1/ssh.c 2018-08-08 10:08:40.825719999 +0200
|
|
@@ -76,6 +76,8 @@
|
|
#include <openssl/evp.h>
|
|
#include <openssl/err.h>
|
|
#endif
|
|
+#include <openssl/fips.h>
|
|
+#include <fipscheck.h>
|
|
#include "openbsd-compat/openssl-compat.h"
|
|
#include "openbsd-compat/sys-queue.h"
|
|
|
|
@@ -579,6 +581,14 @@ 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 */
|
|
@@ -1045,7 +1055,6 @@ main(int ac, char **av)
|
|
host_arg = xstrdup(host);
|
|
|
|
#ifdef WITH_OPENSSL
|
|
- OpenSSL_add_all_algorithms();
|
|
ERR_load_crypto_strings();
|
|
#endif
|
|
|
|
@@ -1268,6 +1277,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);
|
|
|
|
diff -up openssh-7.7p1/sshconnect2.c.fips openssh-7.7p1/sshconnect2.c
|
|
--- openssh-7.7p1/sshconnect2.c.fips 2018-08-08 10:08:40.786719670 +0200
|
|
+++ openssh-7.7p1/sshconnect2.c 2018-08-08 10:08:40.825719999 +0200
|
|
@@ -44,6 +44,8 @@
|
|
#include <vis.h>
|
|
#endif
|
|
|
|
+#include <openssl/fips.h>
|
|
+
|
|
#include "openbsd-compat/sys-queue.h"
|
|
|
|
#include "xmalloc.h"
|
|
@@ -235,7 +237,8 @@ order_hostkeyalgs(char *host, struct soc
|
|
for (i = 0; i < options.num_system_hostfiles; i++)
|
|
load_hostkeys(hostkeys, hostname, options.system_hostfiles[i]);
|
|
|
|
- oavail = avail = xstrdup(KEX_DEFAULT_PK_ALG);
|
|
+ oavail = avail = xstrdup((FIPS_mode()
|
|
+ ? KEX_FIPS_PK_ALG : KEX_DEFAULT_PK_ALG));
|
|
maxlen = strlen(avail) + 1;
|
|
first = xmalloc(maxlen);
|
|
last = xmalloc(maxlen);
|
|
@@ -290,21 +293,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 = options.kex_algorithms;
|
|
-
|
|
- if (options.gss_trust_dns)
|
|
- gss_host = (char *)get_canonical_hostname(active_state, 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(&options.kex_algorithms,
|
|
- "%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 = options.kex_algorithms;
|
|
+
|
|
+ if (options.gss_trust_dns)
|
|
+ gss_host = (char *)get_canonical_hostname(active_state, 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(&options.kex_algorithms,
|
|
+ "%s,%s", gss, orig);
|
|
+ }
|
|
}
|
|
}
|
|
#endif
|
|
@@ -322,14 +330,16 @@ ssh_kex2(char *host, struct sockaddr *ho
|
|
if (options.hostkeyalgorithms != NULL) {
|
|
all_key = sshkey_alg_list(0, 0, 1, ',');
|
|
if (kex_assemble_names(&options.hostkeyalgorithms,
|
|
- KEX_DEFAULT_PK_ALG, all_key) != 0)
|
|
+ (FIPS_mode() ? KEX_FIPS_PK_ALG : KEX_DEFAULT_PK_ALG),
|
|
+ all_key) != 0)
|
|
fatal("%s: kex_assemble_namelist", __func__);
|
|
free(all_key);
|
|
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
|
|
compat_pkalg_proposal(options.hostkeyalgorithms);
|
|
} else {
|
|
/* Enforce default */
|
|
- options.hostkeyalgorithms = xstrdup(KEX_DEFAULT_PK_ALG);
|
|
+ options.hostkeyalgorithms = xstrdup((FIPS_mode()
|
|
+ ? KEX_FIPS_PK_ALG : KEX_DEFAULT_PK_ALG));
|
|
/* Prefer algorithms that we already have keys for */
|
|
myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS] =
|
|
compat_pkalg_proposal(
|
|
diff -up openssh-7.7p1/sshd.c.fips openssh-7.7p1/sshd.c
|
|
--- openssh-7.7p1/sshd.c.fips 2018-08-08 10:08:40.818719940 +0200
|
|
+++ openssh-7.7p1/sshd.c 2018-08-08 10:08:40.826720007 +0200
|
|
@@ -66,6 +66,7 @@
|
|
#include <grp.h>
|
|
#include <pwd.h>
|
|
#include <signal.h>
|
|
+#include <syslog.h>
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
@@ -77,6 +78,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"
|
|
#endif
|
|
|
|
@@ -1534,6 +1537,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)) {
|
|
+ openlog(__progname, LOG_PID, LOG_AUTHPRIV);
|
|
+ if (FIPS_mode()) {
|
|
+ syslog(LOG_CRIT, "FIPS integrity verification test failed.");
|
|
+ cleanup_exit(255);
|
|
+ }
|
|
+ else
|
|
+ syslog(LOG_INFO, "FIPS integrity verification test failed.");
|
|
+ closelog();
|
|
+ }
|
|
/* Save argv. Duplicate so setproctitle emulation doesn't clobber it */
|
|
saved_argc = ac;
|
|
rexec_argc = ac;
|
|
@@ -1675,7 +1690,7 @@ main(int ac, char **av)
|
|
else
|
|
closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
|
|
|
|
-#ifdef WITH_OPENSSL
|
|
+#if 0 /* FIPS */
|
|
OpenSSL_add_all_algorithms();
|
|
#endif
|
|
|
|
@@ -1979,6 +1994,10 @@ main(int ac, char **av)
|
|
/* Reinitialize the log (because of the fork above). */
|
|
log_init(__progname, options.log_level, options.log_facility, log_stderr);
|
|
|
|
+ if (FIPS_mode()) {
|
|
+ logit("FIPS mode initialized");
|
|
+ }
|
|
+
|
|
/* Chdir to the root directory so that the current disk can be
|
|
unmounted if desired. */
|
|
if (chdir("/") == -1)
|
|
@@ -2359,10 +2378,14 @@ do_ssh2_kex(void)
|
|
if (strlen(myproposal[PROPOSAL_SERVER_HOST_KEY_ALGS]) == 0)
|
|
orig = NULL;
|
|
|
|
- if (options.gss_keyex)
|
|
- gss = ssh_gssapi_server_mechanisms();
|
|
- else
|
|
- gss = NULL;
|
|
+ if (options.gss_keyex) {
|
|
+ if (FIPS_mode()) {
|
|
+ logit("Disabling GSSAPIKeyExchange. Not usable in FIPS mode");
|
|
+ options.gss_keyex = 0;
|
|
+ } else {
|
|
+ gss = ssh_gssapi_server_mechanisms();
|
|
+ }
|
|
+ }
|
|
|
|
if (gss && orig)
|
|
xasprintf(&newstr, "%s,%s", gss, orig);
|
|
diff -up openssh-7.7p1/sshkey.c.fips openssh-7.7p1/sshkey.c
|
|
--- openssh-7.7p1/sshkey.c.fips 2018-08-08 10:08:40.818719940 +0200
|
|
+++ openssh-7.7p1/sshkey.c 2018-08-08 10:08:40.826720007 +0200
|
|
@@ -34,6 +34,7 @@
|
|
#include <openssl/evp.h>
|
|
#include <openssl/err.h>
|
|
#include <openssl/pem.h>
|
|
+#include <openssl/fips.h>
|
|
#endif
|
|
|
|
#include "crypto_api.h"
|
|
@@ -57,6 +58,7 @@
|
|
#include "sshkey.h"
|
|
#include "sshkey-xmss.h"
|
|
#include "match.h"
|
|
+#include "log.h"
|
|
|
|
#include "xmss_fast.h"
|
|
|
|
@@ -1526,6 +1528,8 @@ rsa_generate_private_key(u_int bits, RSA
|
|
}
|
|
if (!BN_set_word(f4, RSA_F4) ||
|
|
!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__);
|
|
ret = SSH_ERR_LIBCRYPTO_ERROR;
|
|
goto out;
|
|
}
|
|
diff -up openssh-7.7p1/ssh-keygen.c.fips openssh-7.7p1/ssh-keygen.c
|
|
--- openssh-7.7p1/ssh-keygen.c.fips 2018-08-08 10:08:40.801719797 +0200
|
|
+++ openssh-7.7p1/ssh-keygen.c 2018-08-08 10:08:40.827720016 +0200
|
|
@@ -229,6 +229,12 @@ type_bits_valid(int type, const char *na
|
|
OPENSSL_DSA_MAX_MODULUS_BITS : OPENSSL_RSA_MAX_MODULUS_BITS;
|
|
if (*bitsp > maxbits)
|
|
fatal("key bits exceeds maximum %d", maxbits);
|
|
+ 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");
|
|
+ }
|
|
switch (type) {
|
|
case KEY_DSA:
|
|
if (*bitsp != 1024)
|