Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Please login to access the resource
home:dirkmueller:acdc:as_python3_module
openssh-askpass-gnome.17375
openssh-7.7p1-fips.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File openssh-7.7p1-fips.patch of Package openssh-askpass-gnome.17375
# HG changeset patch # Parent 92d953171b34f6fba18d24085eeeaa24b1d2d5b5 FIPS 140-2 compliance. Perform selftests on start and use only FIPS approved algorithms. Index: openssh-7.9p1/Makefile.in =================================================================== --- openssh-7.9p1.orig/Makefile.in 2019-02-28 17:20:15.767164591 +0100 +++ openssh-7.9p1/Makefile.in 2019-03-12 11:41:49.662894934 +0100 @@ -102,6 +102,8 @@ LIBSSH_OBJS=${LIBOPENSSH_OBJS} \ kexdhs.o kexgexs.o kexecdhs.o kexc25519s.o \ platform-pledge.o platform-tracing.o platform-misc.o +LIBSSH_OBJS += fips.o + SSHOBJS= ssh.o readconf.o clientloop.o sshtty.o \ sshconnect.o sshconnect2.o mux.o Index: openssh-7.9p1/cipher-ctr.c =================================================================== --- openssh-7.9p1.orig/cipher-ctr.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/cipher-ctr.c 2019-02-28 17:20:15.919165544 +0100 @@ -27,6 +27,8 @@ #include "xmalloc.h" #include "log.h" +#include "fips.h" + /* compatibility with old or broken OpenSSL versions */ #include "openbsd-compat/openssl-compat.h" @@ -139,6 +141,8 @@ evp_aes_128_ctr(void) #ifndef SSH_OLD_EVP aes_ctr.flags = EVP_CIPH_CBC_MODE | EVP_CIPH_VARIABLE_LENGTH | EVP_CIPH_ALWAYS_CALL_INIT | EVP_CIPH_CUSTOM_IV; + if (fips_mode()) + aes_ctr.flags |= EVP_CIPH_FLAG_FIPS; #endif return (&aes_ctr); } Index: openssh-7.9p1/cipher.c =================================================================== --- openssh-7.9p1.orig/cipher.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/cipher.c 2019-03-12 11:41:49.662894934 +0100 @@ -51,6 +51,8 @@ #include "openbsd-compat/openssl-compat.h" +#include "fips.h" +#include "log.h" struct sshcipher_ctx { int plaintext; @@ -80,7 +82,7 @@ struct sshcipher { #endif }; -static const struct sshcipher ciphers[] = { +static const struct sshcipher ciphers_all[] = { #ifdef WITH_OPENSSL #ifndef OPENSSL_NO_DES { "3des-cbc", 8, 24, 0, 0, CFLAG_CBC, EVP_des_ede3_cbc }, @@ -111,8 +113,52 @@ static const struct sshcipher ciphers[] { NULL, 0, 0, 0, 0, 0, NULL } }; +static const struct sshcipher ciphers_fips140_2[] = { +#ifdef WITH_OPENSSL + { "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 array of ciphers available depending on selected FIPS mode */ +static const struct sshcipher * +fips_select_ciphers(void) +{ + int fips = fips_mode(); + switch (fips) { + case 0: + return ciphers_all; + case 1: + return ciphers_fips140_2; + default: + /* should not be reached */ + fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", + fips, __FILE__, __LINE__); + return NULL; + } +} + /* Returns a comma-separated list of supported ciphers. */ char * cipher_alg_list(char sep, int auth_only) @@ -121,7 +167,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_select_ciphers(); c->name != NULL; c++) { if ((c->flags & CFLAG_INTERNAL) != 0) continue; if (auth_only && c->auth_len == 0) @@ -193,7 +239,7 @@ const struct sshcipher * cipher_by_name(const char *name) { const struct sshcipher *c; - for (c = ciphers; c->name != NULL; c++) + for (c = fips_select_ciphers(); c->name != NULL; c++) if (strcmp(c->name, name) == 0) return c; return NULL; Index: openssh-7.9p1/fips.c =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openssh-7.9p1/fips.c 2019-03-12 11:42:10.971006569 +0100 @@ -0,0 +1,212 @@ +/* + * Copyright (c) 2012 Petr Cerny. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#include "includes.h" + +#include "fips.h" + +#include "cipher.h" +#include "dh.h" +#include "digest.h" +#include "kex.h" +#include "sshkey.h" +#include "mac.h" +#include "log.h" +#include "xmalloc.h" + +#include <string.h> +#include <openssl/crypto.h> + +static int fips_state = -1; + +static int +fips_check_required_env(void) +{ + int fips_required = 0; + char *env = getenv(SSH_FORCE_FIPS_ENV); + + if (env) { + errno = 0; + fips_required = strtol(env, NULL, 10); + if (errno) { + debug("bogus value in the %s environment variable, ignoring\n" + , SSH_FORCE_FIPS_ENV); + fips_required = 0; + } else + fips_required = 1; + } + return fips_required; +} + +int +fips_mode(void) +{ + if (-1 == fips_state) { + fips_state = FIPS_mode(); + if (fips_state) + debug("FIPS mode initialized"); + else { + if (fips_check_required_env()) { + debug("FIPS mode requested through the environment variable '%s'" + , SSH_FORCE_FIPS_ENV); + if (!FIPS_mode_set(1)) + fatal("Unable to enter FIPS mode as requested through the environment variable '%s'" + , SSH_FORCE_FIPS_ENV); + fips_state = 1; + } + } + } + return fips_state; +} + +int +fips_correct_dgst(int digest) +{ + int fips; + int rv = -1; + + fips = fips_mode(); + switch (fips) { + case 0: + rv = digest; + break; + case 1: + switch (digest) { + case SSH_DIGEST_MD5: + case SSH_DIGEST_SHA1: + debug("MD5/RIPEMD160 digests not allowed in FIPS 140-2 mode" + "using SHA-256 instead."); + rv = SSH_DIGEST_SHA256; + break; + default: + rv = digest; + break; + } + break; + default: + /* should not be reached */ + fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", + fips, __FILE__, __LINE__); + } + + return rv; +} + +/* + * filter out FIPS disallowed algorithms + * *crypto MUST be free()-able - it is assigned newly allocated memory and + * the previous one is freed + * + * returns zero if all algorithms were rejected, non-zero otherwise + */ +int +fips_filter_crypto(char **crypto, fips_filters filter) +{ + char *token, *tmp, *tmp_sav, *new; + int plus = 0; + int valid; + int comma = 0; + int empty = 1; + size_t len; + + tmp = tmp_sav = xstrdup(*crypto); + + len = strlen(tmp) + 1; + new = xcalloc(1, len); + + if ('+' == *tmp) { + plus = 1; + tmp++; + } + + while ((token = strsep(&tmp, ",")) != NULL) { + switch(filter) { + case FIPS_FILTER_CIPHERS: + valid = ciphers_valid(token); + if (!valid) + debug("Cipher '%s' is not allowed in FIPS mode", + token); + break; + case FIPS_FILTER_MACS: + valid = mac_valid(token); + if (!valid) + debug("MAC '%s' is not allowed in FIPS mode", + token); + break; + case FIPS_FILTER_KEX_ALGS: + valid = kex_names_valid(token); + if (!valid) + debug("KEX '%s' is not allowed in FIPS mode", + token); + break; + default: + /* should not be reached */ + fatal("Fatal error: incorrect FIPS filter '%i' requested at %s:%u", + filter, __FILE__, __LINE__); + } + + if (valid) { + empty = 0; + if (plus) { + strlcat(new, "+", len); + plus = 0; + } + if (comma) + strlcat(new, ",", len); + else + comma = 1; + strlcat(new, token, len); + } + } + + /* free tmp and re-allocate shorter buffer for result if necessary */ + free(tmp_sav); + free(*crypto); + *crypto = new; + + return (!empty); +} + +int +fips_dgst_min(void) +{ + int fips; + int dgst; + + fips = fips_mode(); + switch (fips) { + case 0: + dgst = SSH_DIGEST_MD5; + break; + case 1: + dgst = SSH_DIGEST_SHA256; + break; + default: + /* should not be reached */ + fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", + fips, __FILE__, __LINE__); + } + return dgst; +} + Index: openssh-7.9p1/fips.h =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ openssh-7.9p1/fips.h 2019-03-12 11:41:49.514894158 +0100 @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2012 Petr Cerny. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef FIPS_H +#define FIPS_H + +#include "sshkey.h" + +#define SSH_FORCE_FIPS_ENV "SSH_FORCE_FIPS" + +typedef enum { + FIPS_FILTER_CIPHERS, + FIPS_FILTER_MACS, + FIPS_FILTER_KEX_ALGS +} fips_filters; + +int fips_mode(void); +int fips_correct_dgst(int); +int fips_dgst_min(void); +enum fp_type fips_correct_fp_type(enum fp_type); +int fips_filter_crypto(char **, fips_filters); + +#endif + Index: openssh-7.9p1/hmac.c =================================================================== --- openssh-7.9p1.orig/hmac.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/hmac.c 2019-02-28 17:20:15.919165544 +0100 @@ -144,7 +144,7 @@ hmac_test(void *key, size_t klen, void * size_t i; u_char digest[16]; - if ((ctx = ssh_hmac_start(SSH_DIGEST_MD5)) == NULL) + if ((ctx = ssh_hmac_start(fips_correct_dgst(SSH_DIGEST_MD5))) == NULL) printf("ssh_hmac_start failed"); if (ssh_hmac_init(ctx, key, klen) < 0 || ssh_hmac_update(ctx, m, mlen) < 0 || Index: openssh-7.9p1/kex.c =================================================================== --- openssh-7.9p1.orig/kex.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/kex.c 2019-02-28 17:20:15.919165544 +0100 @@ -54,6 +54,8 @@ #include "sshbuf.h" #include "digest.h" +#include "fips.h" + /* prototype */ static int kex_choose_conf(struct ssh *); static int kex_input_newkeys(int, u_int32_t, struct ssh *); @@ -77,7 +79,7 @@ struct kexalg { int ec_nid; int hash_alg; }; -static const struct kexalg kexalgs[] = { +static const struct kexalg kexalgs_all[] = { #ifdef WITH_OPENSSL { KEX_DH1, KEX_DH_GRP1_SHA1, 0, SSH_DIGEST_SHA1 }, { KEX_DH14_SHA1, KEX_DH_GRP14_SHA1, 0, SSH_DIGEST_SHA1 }, @@ -106,6 +108,47 @@ static const struct kexalg kexalgs[] = { { NULL, -1, -1, -1}, }; +static const struct kexalg kexalgs_fips140_2[] = { +#ifdef WITH_OPENSSL + { 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 + { 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 /* OPENSSL_HAS_NISTP521 */ +#endif /* OPENSSL_HAS_ECC */ +#endif /* WITH_OPENSSL */ + { NULL, -1, -1, -1}, +}; + +/* Returns array of macs available depending on selected FIPS mode */ +static const struct kexalg * +fips_select_kexalgs(void) +{ + int fips = fips_mode(); + switch (fips) { + case 0: + return kexalgs_all; + case 1: + return kexalgs_fips140_2; + default: + /* should not be reached */ + fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", + fips, __FILE__, __LINE__); + } +} + char * kex_alg_list(char sep) { @@ -113,7 +156,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_select_kexalgs(); k->name != NULL; k++) { if (ret != NULL) ret[rlen++] = sep; nlen = strlen(k->name); @@ -133,7 +176,7 @@ kex_alg_by_name(const char *name) { const struct kexalg *k; - for (k = kexalgs; k->name != NULL; k++) { + for (k = fips_select_kexalgs(); k->name != NULL; k++) { if (strcmp(k->name, name) == 0) return k; } @@ -153,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) { + /* do not complain here - MACs and ciphers checks + * are silent here error("Unsupported KEX algorithm \"%.100s\"", p); + */ free(s); return 0; } Index: openssh-7.9p1/mac.c =================================================================== --- openssh-7.9p1.orig/mac.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/mac.c 2019-02-28 17:20:15.923165569 +0100 @@ -40,6 +40,9 @@ #include "openbsd-compat/openssl-compat.h" +#include "fips.h" +#include "log.h" + #define SSH_DIGEST 1 /* SSH_DIGEST_XXX */ #define SSH_UMAC 2 /* UMAC (not integrated with OpenSSL) */ #define SSH_UMAC128 3 @@ -54,7 +57,7 @@ struct macalg { int etm; /* Encrypt-then-MAC */ }; -static const struct macalg macs[] = { +static const struct macalg macs_all[] = { /* 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 +85,41 @@ static const struct macalg macs[] = { { NULL, 0, 0, 0, 0, 0, 0 } }; +static const struct macalg macs_fips140_2[] = { + /* 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 array of macs available depending on selected FIPS mode */ +static const struct macalg * +fips_select_macs(void) +{ + int fips = fips_mode(); + switch (fips) { + case 0: + return macs_all; + case 1: + return macs_fips140_2; + default: + /* should not be reached */ + fatal("Fatal error: incorrect FIPS mode '%i' at %s:%u", + fips, __FILE__, __LINE__); + } +} + /* Returns a list of supported MACs separated by the specified char. */ char * mac_alg_list(char sep) @@ -90,7 +128,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_select_macs(); m->name != NULL; m++) { if (ret != NULL) ret[rlen++] = sep; nlen = strlen(m->name); @@ -129,7 +167,7 @@ mac_setup(struct sshmac *mac, char *name { const struct macalg *m; - for (m = macs; m->name != NULL; m++) { + for (m = fips_select_macs(); m->name != NULL; m++) { if (strcmp(name, m->name) != 0) continue; if (mac != NULL) Index: openssh-7.9p1/myproposal.h =================================================================== --- openssh-7.9p1.orig/myproposal.h 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/myproposal.h 2019-02-28 17:20:15.923165569 +0100 @@ -151,6 +151,8 @@ #else /* WITH_OPENSSL */ +#error "OpenSSL support is needed for FIPS mode to compile" + #define KEX_SERVER_KEX \ "curve25519-sha256," \ "curve25519-sha256@libssh.org" Index: openssh-7.9p1/readconf.c =================================================================== --- openssh-7.9p1.orig/readconf.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/readconf.c 2019-02-28 20:20:19.619112418 +0100 @@ -68,6 +68,8 @@ #include "myproposal.h" #include "digest.h" +#include "fips.h" + /* Format of the configuration file: # Configuration data is parsed as follows: @@ -1816,6 +1818,23 @@ option_clear_or_none(const char *o) return o == NULL || strcasecmp(o, "none") == 0; } +/* remove algorithms not approved for use in FIPS mode, when running in FIPS + * mode + */ +void +filter_fips_algorithms(Options *o) +{ + if (fips_mode()) { + if (!fips_filter_crypto(&o->ciphers, FIPS_FILTER_CIPHERS)) + fatal("None of selected ciphers can be used in FIPS mode"); + if (!fips_filter_crypto(&o->macs, FIPS_FILTER_MACS)) + fatal("None of selected MAC algorithms can be used in FIPS mode"); + if (!fips_filter_crypto(&o->kex_algorithms, FIPS_FILTER_KEX_ALGS)) + fatal("None of selected KEX algorithms can be used in FIPS mode"); + } + return; +} + /* * Initializes options to special values that indicate that they have not yet * been set. Read_config_file will only set options with this value. Options @@ -2095,6 +2114,8 @@ fill_default_options(Options * options) options->canonicalize_hostname = SSH_CANONICALISE_NO; if (options->fingerprint_hash == -1) options->fingerprint_hash = SSH_FP_HASH_DEFAULT; + options->fingerprint_hash = + fips_correct_dgst(options->fingerprint_hash); if (options->update_hostkeys == -1) options->update_hostkeys = 0; @@ -2122,6 +2143,7 @@ fill_default_options(Options * options) free(all_kex); free(all_key); free(all_sig); + filter_fips_algorithms(options); #define CLEAR_ON_NONE(v) \ do { \ Index: openssh-7.9p1/readconf.h =================================================================== --- openssh-7.9p1.orig/readconf.h 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/readconf.h 2019-02-28 17:20:15.923165569 +0100 @@ -197,6 +197,7 @@ typedef struct { #define SSH_STRICT_HOSTKEY_YES 2 #define SSH_STRICT_HOSTKEY_ASK 3 +void filter_fips_algorithms(Options *o); void initialize_options(Options *); void fill_default_options(Options *); void fill_default_options_for_canonicalization(Options *); Index: openssh-7.9p1/servconf.c =================================================================== --- openssh-7.9p1.orig/servconf.c 2019-02-28 17:20:15.851165117 +0100 +++ openssh-7.9p1/servconf.c 2019-02-28 17:20:15.923165569 +0100 @@ -64,6 +64,7 @@ #include "auth.h" #include "myproposal.h" #include "digest.h" +#include "fips.h" static void add_listen_addr(ServerOptions *, const char *, const char *, int); @@ -190,6 +191,23 @@ option_clear_or_none(const char *o) return o == NULL || strcasecmp(o, "none") == 0; } +/* remove algorithms not approved for use in FIPS mode, when running in FIPS + * mode + */ +static void +filter_fips_algorithms_s(ServerOptions *o) +{ + if (fips_mode()) { + if (!fips_filter_crypto(&o->ciphers, FIPS_FILTER_CIPHERS)) + fatal("None of selected ciphers can be used in FIPS mode"); + if (!fips_filter_crypto(&o->macs, FIPS_FILTER_MACS)) + fatal("None of selected MAC algorithms can be used in FIPS mode"); + if (!fips_filter_crypto(&o->kex_algorithms, FIPS_FILTER_KEX_ALGS)) + fatal("None of selected KEX algorithms can be used in FIPS mode"); + } + return; +} + static void assemble_algorithms(ServerOptions *o) { @@ -219,6 +237,8 @@ assemble_algorithms(ServerOptions *o) free(all_kex); free(all_key); free(all_sig); + + filter_fips_algorithms_s(o); } static void @@ -410,6 +430,8 @@ fill_default_server_options(ServerOption options->fwd_opts.streamlocal_bind_unlink = 0; if (options->fingerprint_hash == -1) options->fingerprint_hash = SSH_FP_HASH_DEFAULT; + options->fingerprint_hash = + fips_correct_dgst(options->fingerprint_hash); if (options->disable_forwarding == -1) options->disable_forwarding = 0; if (options->expose_userauth_info == -1) Index: openssh-7.9p1/ssh-keygen.c =================================================================== --- openssh-7.9p1.orig/ssh-keygen.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/ssh-keygen.c 2019-02-28 17:20:15.923165569 +0100 @@ -61,6 +61,8 @@ #include "utf8.h" #include "authfd.h" +#include "fips.h" + #ifdef WITH_OPENSSL # define DEFAULT_KEY_TYPE_NAME "rsa" #else @@ -996,11 +998,13 @@ do_fingerprint(struct passwd *pw) static void do_gen_all_hostkeys(struct passwd *pw) { - struct { + struct Key_types { char *key_type; char *key_type_display; char *path; - } key_types[] = { + }; + + struct Key_types key_types_all[] = { #ifdef WITH_OPENSSL { "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, { "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE }, @@ -1015,6 +1019,17 @@ do_gen_all_hostkeys(struct passwd *pw) { NULL, NULL, NULL } }; + struct Key_types key_types_fips140_2[] = { +#ifdef WITH_OPENSSL + { "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE }, +#ifdef OPENSSL_HAS_ECC + { "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE }, +#endif /* OPENSSL_HAS_ECC */ +#endif /* WITH_OPENSSL */ + { NULL, NULL, NULL } + }; + + struct Key_types *key_types; int first = 0; struct stat st; struct sshkey *private, *public; @@ -1022,6 +1037,12 @@ do_gen_all_hostkeys(struct passwd *pw) int i, type, fd, r; FILE *f; + if (fips_mode()) { + key_types = key_types_fips140_2; + } else { + key_types = key_types_all; + } + for (i = 0; key_types[i].key_type; i++) { public = private = NULL; prv_tmp = pub_tmp = prv_file = pub_file = NULL; @@ -2817,6 +2838,15 @@ main(int argc, char **argv) key_type_name = DEFAULT_KEY_TYPE_NAME; type = sshkey_type_from_name(key_type_name); + + /* protocol v1 is not allowed in FIPS mode, DSA is not acceptable because + * it has to be 1024 bit due to RFC 4253 using SHA-1 which implies 1024 bit + * keys due to FIPS-186 specification for DSS */ + if (fips_mode() && + (type == KEY_DSA || type == KEY_ED25519 || + type == KEY_DSA_CERT || type == KEY_ED25519_CERT)) + fatal("Key type %s not alowed in FIPS mode", key_type_name); + type_bits_valid(type, key_type_name, &bits); if (!quiet) Index: openssh-7.9p1/ssh_config.0 =================================================================== --- openssh-7.9p1.orig/ssh_config.0 2018-10-19 03:06:19.000000000 +0200 +++ openssh-7.9p1/ssh_config.0 2019-02-28 17:20:15.923165569 +0100 @@ -353,6 +353,9 @@ DESCRIPTION Specifies the hash algorithm used when displaying key fingerprints. Valid options are: md5 and sha256 (the default). + In the FIPS mode the minimum of SHA-1 is enforced (which means + sha256). + ForwardAgent Specifies whether the connection to the authentication agent (if any) will be forwarded to the remote machine. The argument must @@ -610,6 +613,9 @@ DESCRIPTION The list of available key exchange algorithms may also be obtained using "ssh -Q kex". + In the FIPS mode the FIPS standard takes precedence over RFC and + forces the minimum to a higher value, currently 2048 bits. + LocalCommand Specifies a command to execute on the local machine after successfully connecting to the server. The command string Index: openssh-7.9p1/ssh_config.5 =================================================================== --- openssh-7.9p1.orig/ssh_config.5 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/ssh_config.5 2019-02-28 17:20:15.923165569 +0100 @@ -642,6 +642,8 @@ Valid options are: and .Cm sha256 (the default). +.Pp +In the FIPS mode the minimum of SHA-1 is enforced (which means sha256). .It Cm ForwardAgent Specifies whether the connection to the authentication agent (if any) will be forwarded to the remote machine. Index: openssh-7.9p1/sshd.c =================================================================== --- openssh-7.9p1.orig/sshd.c 2018-10-17 02:01:20.000000000 +0200 +++ openssh-7.9p1/sshd.c 2019-03-12 11:41:49.514894158 +0100 @@ -123,6 +123,8 @@ #include "version.h" #include "ssherr.h" +#include "fips.h" + /* Re-exec fds */ #define REEXEC_DEVCRYPTO_RESERVED_FD (STDERR_FILENO + 1) #define REEXEC_STARTUP_PIPE_FD (STDERR_FILENO + 2) Index: openssh-7.9p1/sshd_config.0 =================================================================== --- openssh-7.9p1.orig/sshd_config.0 2019-02-28 17:20:15.851165117 +0100 +++ openssh-7.9p1/sshd_config.0 2019-02-28 17:20:15.927165594 +0100 @@ -348,6 +348,9 @@ DESCRIPTION Specifies the hash algorithm used when logging key fingerprints. Valid options are: md5 and sha256. The default is sha256. + In the FIPS mode the minimum of SHA-1 is enforced (which means + sha256). + ForceCommand Forces the execution of the command specified by ForceCommand, ignoring any command supplied by the client and ~/.ssh/rc if @@ -555,6 +558,9 @@ DESCRIPTION The list of available key exchange algorithms may also be obtained using "ssh -Q kex". + In the FIPS mode the FIPS standard takes precedence over RFC and + forces the minimum to a higher value, currently 2048 bits. + ListenAddress Specifies the local addresses sshd(8) should listen on. The following forms may be used: Index: openssh-7.9p1/sshd_config.5 =================================================================== --- openssh-7.9p1.orig/sshd_config.5 2019-02-28 17:20:15.851165117 +0100 +++ openssh-7.9p1/sshd_config.5 2019-02-28 17:20:15.927165594 +0100 @@ -603,6 +603,8 @@ and .Cm sha256 . The default is .Cm sha256 . +.Pp +In the FIPS mode the minimum of SHA-1 is enforced (which means sha256). .It Cm ForceCommand Forces the execution of the command specified by .Cm ForceCommand ,
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
