rpms/openssh
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
580f986839
openssh/openssh-6.7p1-fips.patch

686 lines
21 KiB
Diff
Raw Normal View History

fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
diff --git a/Makefile.in b/Makefile.in
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index 9311e16..1eb2b45 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/Makefile.in
+++ b/Makefile.in
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -164,25 +164,25 @@ libssh.a: $(LIBSSH_OBJS)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
$(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)
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -197,7 +197,7 @@ ctr-cavstest$(EXEEXT): $(LIBCOMPAT) libssh.a ctr-cavstest.o
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
$(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 --git a/cipher-ctr.c b/cipher-ctr.c
index 73e9c7c..40ee395 100644
--- a/cipher-ctr.c
+++ b/cipher-ctr.c
@@ -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 --git a/cipher.c b/cipher.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index 9cc7cf8..5ebfa84 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/cipher.c
+++ b/cipher.c
@@ -39,6 +39,8 @@
#include <sys/types.h>
+#include <openssl/fips.h>
+
#include <string.h>
#include <stdarg.h>
#include <stdio.h>
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -99,6 +101,26 @@ static const struct sshcipher ciphers[] = {
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
{ NULL, SSH_CIPHER_INVALID, 0, 0, 0, 0, 0, 0, NULL }
};
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
+static const struct sshcipher fips_ciphers[] = {
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
+ { "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 }
+};
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
+
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
/*--*/
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
/* Returns a comma-separated list of supported ciphers. */
@@ -109,7 +131,7 @@ cipher_alg_list(char sep, int auth_only)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
size_t nlen, rlen = 0;
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
const struct sshcipher *c;
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
- 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)
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -193,7 +215,7 @@ const struct sshcipher *
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
cipher_by_name(const char *name)
{
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
const struct sshcipher *c;
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
- 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;
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -203,7 +225,7 @@ const struct sshcipher *
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
cipher_by_number(int id)
{
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
const struct sshcipher *c;
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
- 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;
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -244,7 +266,7 @@ cipher_number(const char *name)
const struct sshcipher *c;
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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 --git a/dh.h b/dh.h
index 48f7b68..9ff39f4 100644
--- a/dh.h
+++ b/dh.h
@@ -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 --git a/entropy.c b/entropy.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index d24e724..06b0095 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/entropy.c
+++ b/entropy.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -215,6 +215,9 @@ seed_rng(void)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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 --git a/kex.c b/kex.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index e0cf3de..e11198f 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/kex.c
+++ b/kex.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -35,6 +35,7 @@
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
#ifdef WITH_OPENSSL
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#include <openssl/crypto.h>
+#include <openssl/fips.h>
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
#endif
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#include "xmalloc.h"
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -107,6 +108,25 @@ static const struct kexalg kexalgs[] = {
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
{ 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
Update coverity patch after rebase to 6.7
2015-01-30 13:27:43 +00:00
+ { NULL, -1, -1, -1},
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
+};
+
char *
kex_alg_list(char sep)
{
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -130,7 +150,7 @@ kex_alg_by_name(const char *name)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
{
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
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -155,7 +175,10 @@ kex_names_valid(const char *names)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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 --git a/kexecdhc.c b/kexecdhc.c
index 2f7629c..20c9946 100644
--- a/kexecdhc.c
+++ b/kexecdhc.c
@@ -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 --git a/kexecdhs.c b/kexecdhs.c
index 2700b72..0820894 100644
--- a/kexecdhs.c
+++ b/kexecdhs.c
@@ -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 --git a/kexgexc.c b/kexgexc.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index 0a91bdd..b75930b 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/kexgexc.c
+++ b/kexgexc.c
@@ -26,6 +26,8 @@
#include "includes.h"
+#include <openssl/fips.h>
+
#include <sys/types.h>
#include <openssl/dh.h>
use different values for DH for Cisco servers (#1026430)
2014-12-01 15:48:15 +00:00
@@ -58,7 +60,7 @@ kexgex_client(Kex *kex)
int min, max, nbits;
DH *dh;
- min = DH_GRP_MIN;
+ min = FIPS_mode() ? DH_GRP_MIN_FIPS : DH_GRP_MIN;
max = DH_GRP_MAX;
/* Servers with MAX4096DH need a preferred size (nbits) <= 4096.
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
diff --git a/kexgexs.c b/kexgexs.c
index 770ad28..9d4fc6d 100644
--- a/kexgexs.c
+++ b/kexgexs.c
@@ -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 --git a/mac.c b/mac.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index fd07bf2..fedfbb2 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/mac.c
+++ b/mac.c
@@ -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 --git a/myproposal.h b/myproposal.h
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index b35b2b8..a608d27 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/myproposal.h
+++ b/myproposal.h
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -140,6 +140,28 @@
"hmac-sha1-96," \
"hmac-md5-96"
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
+#define KEX_DEFAULT_KEX_FIPS \
+ KEX_ECDH_METHODS \
+ KEX_SHA256_METHODS \
+ "diffie-hellman-group-exchange-sha1," \
+ "diffie-hellman-group14-sha1"
+#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
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
+
#else
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
#define KEX_SERVER_KEX \
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
diff --git a/ssh.c b/ssh.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index 26e9681..a0a7c29 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/ssh.c
+++ b/ssh.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -75,6 +75,8 @@
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#include <openssl/evp.h>
#include <openssl/err.h>
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
#endif
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
+#include <openssl/fips.h>
+#include <fipscheck.h>
#include "openbsd-compat/openssl-compat.h"
#include "openbsd-compat/sys-queue.h"
Update coverity patch after rebase to 6.7
2015-01-30 13:27:43 +00:00
@@ -433,6 +435,14 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
sanitise_stdfd();
__progname = ssh_get_progname(av[0]);
+ SSLeay_add_all_algorithms();
+ if (access("/etc/system-fips", F_OK) == 0)
Update coverity patch after rebase to 6.7
2015-01-30 13:27:43 +00:00
+ if (! FIPSCHECK_verify(NULL, NULL)){
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
+ if (FIPS_mode())
+ fatal("FIPS integrity verification test failed.");
+ else
+ logit("FIPS integrity verification test failed.");
Update coverity patch after rebase to 6.7
2015-01-30 13:27:43 +00:00
+ }
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#ifndef HAVE_SETPROCTITLE
/* Prepare for later setproctitle emulation */
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -510,6 +519,9 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
"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':
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -841,7 +853,6 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
host_arg = xstrdup(host);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
#ifdef WITH_OPENSSL
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
- OpenSSL_add_all_algorithms();
ERR_load_crypto_strings();
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
#endif
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -997,6 +1008,10 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
seed_rng();
+ if (FIPS_mode()) {
+ logit("FIPS mode initialized");
+ }
+
if (options.user == NULL)
options.user = xstrdup(pw->pw_name);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -1069,6 +1084,12 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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 --git a/sshconnect2.c b/sshconnect2.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index efe6158..5631f39 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/sshconnect2.c
+++ b/sshconnect2.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -46,6 +46,8 @@
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#include <vis.h>
#endif
+#include <openssl/fips.h>
+
#include "openbsd-compat/sys-queue.h"
#include "xmalloc.h"
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -171,20 +173,25 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#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 (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];
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
- if (options.gss_trust_dns)
- gss_host = (char *)get_canonical_hostname(1);
- else
- gss_host = host;
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
+ if (options.gss_trust_dns)
+ gss_host = (char *)get_canonical_hostname(1);
+ else
+ gss_host = host;
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
- gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity);
- if (gss) {
- debug("Offering GSSAPI proposal: %s", gss);
- xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
- "%s,%s", gss, orig);
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
+ gss = ssh_gssapi_client_mechanisms(gss_host, options.gss_client_identity);
+ if (gss) {
+ debug("Offering GSSAPI proposal: %s", gss);
+ xasprintf(&myproposal[PROPOSAL_KEX_ALGS],
+ "%s,%s", gss, orig);
+ }
}
}
#endif
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -196,6 +203,10 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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]);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -211,7 +222,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -223,9 +238,11 @@ ssh_kex2(char *host, struct sockaddr *hostaddr, u_short port)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
}
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 --git a/sshd.c b/sshd.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
index db23ce2..3ce59f0 100644
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
--- a/sshd.c
+++ b/sshd.c
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -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>
@@ -76,6 +77,8 @@
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#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"
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
#endif
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -1479,6 +1482,18 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
#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;
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -1630,7 +1645,7 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
else
closefrom(REEXEC_DEVCRYPTO_RESERVED_FD);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
-#ifdef WITH_OPENSSL
+#if 0 /* FIPS */
OpenSSL_add_all_algorithms();
#endif
@@ -1816,6 +1831,10 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
debug("private host key: #%d type %d %s", i, keytype,
key_type(key ? key : pubkey));
}
+ if ((options.protocol & SSH_PROTO_1) && FIPS_mode()) {
+ logit("Disabling protocol version 1. Not allowed in the FIPS mode.");
+ options.protocol &= ~SSH_PROTO_1;
+ }
if ((options.protocol & SSH_PROTO_1) && !sensitive_data.have_ssh1_key) {
logit("Disabling protocol version 1. Could not load host key");
options.protocol &= ~SSH_PROTO_1;
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -1982,6 +2001,10 @@ main(int ac, char **av)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
/* 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)
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -2541,6 +2564,9 @@ do_ssh2_kex(void)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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]);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -2550,6 +2576,9 @@ do_ssh2_kex(void)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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.compression == COMP_NONE) {
myproposal[PROPOSAL_COMP_ALGS_CTOS] =
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -2560,6 +2589,8 @@ do_ssh2_kex(void)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
}
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]);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
@@ -2586,10 +2617,14 @@ do_ssh2_kex(void)
fix and rebase fips patch to 6.6.1p1
2014-07-09 19:16:53 +00:00
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);
6.7p1-1 + 0.9.3-4
2015-01-20 12:18:45 +00:00
diff --git a/sshkey.c b/sshkey.c
index f078e11..5e3d97f 100644
--- a/sshkey.c
+++ b/sshkey.c
@@ -34,6 +34,7 @@
#include <openssl/evp.h>
#include <openssl/err.h>
#include <openssl/pem.h>
+#include <openssl/fips.h>
#include "crypto_api.h"
@@ -1523,6 +1524,8 @@ rsa_generate_private_key(u_int bits, RSA **rsap)
}
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;
}
Reference in New Issue Copy Permalink