From b1a9148fbe8ed5ffa2f489f1798f79f3dec55e6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= Date: Sun, 12 Nov 2023 17:20:08 +0100 Subject: [PATCH] v9.0.1 --- ...patch => 0001-remove-babeld-and-ldpd.patch | 27 +- 0002-enable-openssl.patch | 99 ++-- 0003-disable-eigrp-crypto.patch | 465 +++++++++--------- 0004-fips-mode.patch | 112 +++-- 0005-remove-grpc-test.patch | 23 +- frr.spec | 5 +- 6 files changed, 404 insertions(+), 327 deletions(-) rename 0000-remove-babeld-and-ldpd.patch => 0001-remove-babeld-and-ldpd.patch (65%) diff --git a/0000-remove-babeld-and-ldpd.patch b/0001-remove-babeld-and-ldpd.patch similarity index 65% rename from 0000-remove-babeld-and-ldpd.patch rename to 0001-remove-babeld-and-ldpd.patch index 4fac02b..463f42d 100644 --- a/0000-remove-babeld-and-ldpd.patch +++ b/0001-remove-babeld-and-ldpd.patch @@ -1,8 +1,18 @@ +From 8c6e4318d2efd2314d8e9f30baefffef7de5a116 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= +Date: Sun, 8 Oct 2023 11:22:51 +0200 +Subject: [PATCH 1/5] remove babeld and ldpd + +--- + Makefile.am | 4 ---- + tools/etc/frr/daemons | 4 ---- + 2 files changed, 8 deletions(-) + diff --git a/Makefile.am b/Makefile.am -index 5be3264..33abc1d 100644 +index f56e1b8e0..a42811d94 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -130,8 +130,6 @@ include ospf6d/subdir.am +@@ -196,8 +196,6 @@ include ospf6d/subdir.am include ospfclient/subdir.am include isisd/subdir.am include nhrpd/subdir.am @@ -11,15 +21,15 @@ index 5be3264..33abc1d 100644 include eigrpd/subdir.am include sharpd/subdir.am include pimd/subdir.am -@@ -182,7 +180,6 @@ EXTRA_DIST += \ +@@ -261,7 +259,6 @@ EXTRA_DIST += \ snapcraft/defaults \ snapcraft/helpers \ snapcraft/snap \ - babeld/Makefile \ + mgmtd/Makefile \ bgpd/Makefile \ bgpd/rfp-example/librfp/Makefile \ - bgpd/rfp-example/rfptest/Makefile \ -@@ -193,7 +190,6 @@ EXTRA_DIST += \ +@@ -274,7 +271,6 @@ EXTRA_DIST += \ fpm/Makefile \ grpc/Makefile \ isisd/Makefile \ @@ -28,7 +38,7 @@ index 5be3264..33abc1d 100644 nhrpd/Makefile \ ospf6d/Makefile \ diff --git a/tools/etc/frr/daemons b/tools/etc/frr/daemons -index 8aa0887..c92dcca 100644 +index c487e7e5f..2e602901d 100644 --- a/tools/etc/frr/daemons +++ b/tools/etc/frr/daemons @@ -22,10 +22,8 @@ ripngd=no @@ -42,7 +52,7 @@ index 8aa0887..c92dcca 100644 sharpd=no pbrd=no bfdd=no -@@ -48,10 +46,8 @@ ripngd_options=" -A ::1" +@@ -49,10 +47,8 @@ ripngd_options=" -A ::1" isisd_options=" -A 127.0.0.1" pimd_options=" -A 127.0.0.1" pim6d_options=" -A ::1" @@ -53,3 +63,6 @@ index 8aa0887..c92dcca 100644 sharpd_options=" -A 127.0.0.1" pbrd_options=" -A 127.0.0.1" staticd_options="-A 127.0.0.1" +-- +2.41.0 + diff --git a/0002-enable-openssl.patch b/0002-enable-openssl.patch index fa30a88..cea8a64 100644 --- a/0002-enable-openssl.patch +++ b/0002-enable-openssl.patch @@ -1,44 +1,20 @@ -diff --git a/lib/subdir.am b/lib/subdir.am -index 0b7af18..0533e24 100644 ---- a/lib/subdir.am -+++ b/lib/subdir.am -@@ -41,7 +41,6 @@ lib_libfrr_la_SOURCES = \ - lib/log.c \ - lib/log_filter.c \ - lib/log_vty.c \ -- lib/md5.c \ - lib/memory.c \ - lib/mlag.c \ - lib/module.c \ -@@ -64,7 +64,6 @@ lib_libfrr_la_SOURCES = \ - lib/routemap_northbound.c \ - lib/sbuf.c \ - lib/seqlock.c \ -- lib/sha256.c \ - lib/sigevent.c \ - lib/skiplist.c \ - lib/sockopt.c \ -@@ -170,7 +170,6 @@ pkginclude_HEADERS += \ - lib/link_state.h \ - lib/log.h \ - lib/log_vty.h \ -- lib/md5.h \ - lib/memory.h \ - lib/module.h \ - lib/monotime.h \ -@@ -191,7 +190,6 @@ pkginclude_HEADERS += \ - lib/route_opaque.h \ - lib/sbuf.h \ - lib/seqlock.h \ -- lib/sha256.h \ - lib/sigevent.h \ - lib/skiplist.h \ - lib/smux.h \ +From 51ec61745373caa4702604ee2d379066f90b6d60 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= +Date: Sun, 8 Oct 2023 11:19:44 +0200 +Subject: [PATCH 2/5] enable openssl + +--- + isisd/isis_lsp.c | 2 ++ + isisd/isis_pdu.c | 2 ++ + isisd/isis_te.c | 2 ++ + lib/subdir.am | 4 ---- + 4 files changed, 6 insertions(+), 4 deletions(-) + diff --git a/isisd/isis_lsp.c b/isisd/isis_lsp.c -index 1991666..2e4fe55 100644 +index 950d5f359..4cd792246 100644 --- a/isisd/isis_lsp.c +++ b/isisd/isis_lsp.c -@@ -35,7 +35,9 @@ +@@ -22,7 +22,9 @@ #include "hash.h" #include "if.h" #include "checksum.h" @@ -49,10 +25,10 @@ index 1991666..2e4fe55 100644 #include "srcdest_table.h" #include "lib_errors.h" diff --git a/isisd/isis_pdu.c b/isisd/isis_pdu.c -index 9c63311..7cf594c 100644 +index 0cd43a7ab..b2e114d73 100644 --- a/isisd/isis_pdu.c +++ b/isisd/isis_pdu.c -@@ -33,7 +33,9 @@ +@@ -20,7 +20,9 @@ #include "prefix.h" #include "if.h" #include "checksum.h" @@ -63,10 +39,10 @@ index 9c63311..7cf594c 100644 #include "isisd/isis_constants.h" diff --git a/isisd/isis_te.c b/isisd/isis_te.c -index 4ea6c2c..72ff0d2 100644 +index 90b53c540..9d98c16e7 100644 --- a/isisd/isis_te.c +++ b/isisd/isis_te.c -@@ -38,7 +38,9 @@ +@@ -24,7 +24,9 @@ #include "if.h" #include "vrf.h" #include "checksum.h" @@ -76,3 +52,42 @@ index 4ea6c2c..72ff0d2 100644 #include "sockunion.h" #include "network.h" #include "sbuf.h" +diff --git a/lib/subdir.am b/lib/subdir.am +index d7b28ffbd..b2ee32168 100644 +--- a/lib/subdir.am ++++ b/lib/subdir.am +@@ -63,7 +63,6 @@ lib_libfrr_la_SOURCES = \ + lib/log.c \ + lib/log_filter.c \ + lib/log_vty.c \ +- lib/md5.c \ + lib/memory.c \ + lib/mgmt_be_client.c \ + lib/mgmt_fe_client.c \ +@@ -95,7 +94,6 @@ lib_libfrr_la_SOURCES = \ + lib/routemap_northbound.c \ + lib/sbuf.c \ + lib/seqlock.c \ +- lib/sha256.c \ + lib/sigevent.c \ + lib/skiplist.c \ + lib/sockopt.c \ +@@ -248,7 +246,6 @@ pkginclude_HEADERS += \ + lib/link_state.h \ + lib/log.h \ + lib/log_vty.h \ +- lib/md5.h \ + lib/memory.h \ + lib/mgmt.pb-c.h \ + lib/mgmt_be_client.h \ +@@ -283,7 +280,6 @@ pkginclude_HEADERS += \ + lib/route_opaque.h \ + lib/sbuf.h \ + lib/seqlock.h \ +- lib/sha256.h \ + lib/sigevent.h \ + lib/skiplist.h \ + lib/smux.h \ +-- +2.41.0 + diff --git a/0003-disable-eigrp-crypto.patch b/0003-disable-eigrp-crypto.patch index cd43569..a538ce3 100644 --- a/0003-disable-eigrp-crypto.patch +++ b/0003-disable-eigrp-crypto.patch @@ -1,227 +1,26 @@ -diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c -index bedaf15..8dc09bf 100644 ---- a/eigrpd/eigrp_packet.c -+++ b/eigrpd/eigrp_packet.c -@@ -40,8 +40,10 @@ - #include "log.h" - #include "sockopt.h" - #include "checksum.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" - #include "sha256.h" -+#endif - #include "lib_errors.h" - - #include "eigrpd/eigrp_structs.h" -@@ -95,8 +97,12 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, - struct key *key = NULL; - struct keychain *keychain; - -+ - unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN]; -+#ifdef CRYPTO_OPENSSL -+#elif CRYPTO_INTERNAL - MD5_CTX ctx; -+#endif - uint8_t *ibuf; - size_t backup_get, backup_end; - struct TLV_MD5_Authentication_Type *auth_TLV; -@@ -119,6 +125,9 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, - return EIGRP_AUTH_TYPE_NONE; - } - -+#ifdef CRYPTO_OPENSSL -+//TBD when this is fixed in upstream -+#elif CRYPTO_INTERNAL - memset(&ctx, 0, sizeof(ctx)); - MD5Init(&ctx); - -@@ -146,7 +155,7 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, - } - - MD5Final(digest, &ctx); -- -+#endif - /* Append md5 digest to the end of the stream. */ - memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_MD5_LEN); - -@@ -162,7 +171,10 @@ int eigrp_check_md5_digest(struct stream *s, - struct TLV_MD5_Authentication_Type *authTLV, - struct eigrp_neighbor *nbr, uint8_t flags) - { -+#ifdef CRYPTO_OPENSSL -+#elif CRYPTO_INTERNAL - MD5_CTX ctx; -+#endif - unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN]; - unsigned char orig[EIGRP_AUTH_TYPE_MD5_LEN]; - struct key *key = NULL; -@@ -203,6 +215,9 @@ int eigrp_check_md5_digest(struct stream *s, - return 0; - } - -+#ifdef CRYPTO_OPENSSL -+ //TBD when eigrpd crypto is fixed in upstream -+#elif CRYPTO_INTERNAL - memset(&ctx, 0, sizeof(ctx)); - MD5Init(&ctx); - -@@ -230,6 +245,7 @@ int eigrp_check_md5_digest(struct stream *s, - } - - MD5Final(digest, &ctx); -+#endif - - /* compare the two */ - if (memcmp(orig, digest, EIGRP_AUTH_TYPE_MD5_LEN) != 0) { -@@ -254,7 +270,11 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, - unsigned char digest[EIGRP_AUTH_TYPE_SHA256_LEN]; - unsigned char buffer[1 + PLAINTEXT_LENGTH + 45 + 1] = {0}; - -+#ifdef CRYPTO_OPENSSL -+ //TBD when eigrpd crypto is fixed in upstream -+#elif CRYPTO_INTERNAL - HMAC_SHA256_CTX ctx; -+#endif - void *ibuf; - size_t backup_get, backup_end; - struct TLV_SHA256_Authentication_Type *auth_TLV; -@@ -283,6 +303,9 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, - - inet_ntop(AF_INET, &ei->address.u.prefix4, source_ip, PREFIX_STRLEN); - -+#ifdef CRYPTO_OPENSSL -+ //TBD when eigrpd crypto is fixed in upstream -+#elif CRYPTO_INTERNAL - memset(&ctx, 0, sizeof(ctx)); - buffer[0] = '\n'; - memcpy(buffer + 1, key, strlen(key->string)); -@@ -291,7 +314,7 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, - 1 + strlen(key->string) + strlen(source_ip)); - HMAC__SHA256_Update(&ctx, ibuf, strlen(ibuf)); - HMAC__SHA256_Final(digest, &ctx); -- -+#endif - - /* Put hmac-sha256 digest to it's place */ - memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_SHA256_LEN); -diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c -index 93eed94..f1c7347 100644 ---- a/eigrpd/eigrp_filter.c -+++ b/eigrpd/eigrp_filter.c -@@ -47,7 +47,9 @@ - #include "if_rmap.h" - #include "plist.h" - #include "distribute.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - #include "keychain.h" - #include "privs.h" - #include "vrf.h" -diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c -index dacd5ca..b232cc5 100644 ---- a/eigrpd/eigrp_hello.c -+++ b/eigrpd/eigrp_hello.c -@@ -43,7 +43,9 @@ - #include "sockopt.h" - #include "checksum.h" - #include "vty.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - - #include "eigrpd/eigrp_structs.h" - #include "eigrpd/eigrpd.h" -diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c -index 84dcf5e..a2575e3 100644 ---- a/eigrpd/eigrp_query.c -+++ b/eigrpd/eigrp_query.c -@@ -38,7 +38,9 @@ - #include "log.h" - #include "sockopt.h" - #include "checksum.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - #include "vty.h" - - #include "eigrpd/eigrp_structs.h" -diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c -index ccf0496..2902365 100644 ---- a/eigrpd/eigrp_reply.c -+++ b/eigrpd/eigrp_reply.c -@@ -42,7 +42,9 @@ - #include "log.h" - #include "sockopt.h" - #include "checksum.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - #include "vty.h" - #include "keychain.h" - #include "plist.h" -diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c -index ff38325..09b9369 100644 ---- a/eigrpd/eigrp_siaquery.c -+++ b/eigrpd/eigrp_siaquery.c -@@ -38,7 +38,9 @@ - #include "log.h" - #include "sockopt.h" - #include "checksum.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - #include "vty.h" - - #include "eigrpd/eigrp_structs.h" -diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c -index d3dd123..f6a2bd6 100644 ---- a/eigrpd/eigrp_siareply.c -+++ b/eigrpd/eigrp_siareply.c -@@ -37,7 +37,9 @@ - #include "log.h" - #include "sockopt.h" - #include "checksum.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - #include "vty.h" - - #include "eigrpd/eigrp_structs.h" -diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c -index 21c9238..cfb8890 100644 ---- a/eigrpd/eigrp_snmp.c -+++ b/eigrpd/eigrp_snmp.c -@@ -42,7 +42,9 @@ - #include "log.h" - #include "sockopt.h" - #include "checksum.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - #include "keychain.h" - #include "smux.h" - -diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c -index 8db4903..2a4f0bb 100644 ---- a/eigrpd/eigrp_update.c -+++ b/eigrpd/eigrp_update.c -@@ -42,7 +42,9 @@ - #include "log.h" - #include "sockopt.h" - #include "checksum.h" -+#ifdef CRYPTO_INTERNAL - #include "md5.h" -+#endif - #include "vty.h" - #include "plist.h" - #include "plist_int.h" +From 8ec9ddca959618ea6091711cd446ebac5b730147 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= +Date: Sun, 8 Oct 2023 11:23:48 +0200 +Subject: [PATCH 3/5] disable eigrp crypto + +--- + eigrpd/eigrp_cli.c | 15 +++++++++++++++ + eigrpd/eigrp_filter.c | 2 ++ + eigrpd/eigrp_hello.c | 2 ++ + eigrpd/eigrp_packet.c | 27 +++++++++++++++++++++++++-- + eigrpd/eigrp_query.c | 2 ++ + eigrpd/eigrp_reply.c | 2 ++ + eigrpd/eigrp_siaquery.c | 2 ++ + eigrpd/eigrp_siareply.c | 2 ++ + eigrpd/eigrp_snmp.c | 2 ++ + eigrpd/eigrp_update.c | 2 ++ + 10 files changed, 56 insertions(+), 2 deletions(-) + diff --git a/eigrpd/eigrp_cli.c b/eigrpd/eigrp_cli.c -index a93d4c8..b01e121 100644 +index 213834afc..73647937d 100644 --- a/eigrpd/eigrp_cli.c +++ b/eigrpd/eigrp_cli.c -@@ -25,6 +25,7 @@ +@@ -11,6 +11,7 @@ #include "lib/command.h" #include "lib/log.h" #include "lib/northbound_cli.h" @@ -229,7 +28,7 @@ index a93d4c8..b01e121 100644 #include "eigrp_structs.h" #include "eigrpd.h" -@@ -726,6 +726,20 @@ DEFPY( +@@ -716,6 +717,20 @@ DEFPY_YANG( "Keyed message digest\n" "HMAC SHA256 algorithm \n") { @@ -250,3 +49,225 @@ index a93d4c8..b01e121 100644 char xpath[XPATH_MAXLEN], xpath_auth[XPATH_MAXLEN + 64]; snprintf(xpath, sizeof(xpath), "./frr-eigrpd:eigrp/instance[asn='%s']", +diff --git a/eigrpd/eigrp_filter.c b/eigrpd/eigrp_filter.c +index eceef6b8a..1d194be14 100644 +--- a/eigrpd/eigrp_filter.c ++++ b/eigrpd/eigrp_filter.c +@@ -32,7 +32,9 @@ + #include "if_rmap.h" + #include "plist.h" + #include "distribute.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "keychain.h" + #include "privs.h" + #include "vrf.h" +diff --git a/eigrpd/eigrp_hello.c b/eigrpd/eigrp_hello.c +index 662c750e9..a3a5ec822 100644 +--- a/eigrpd/eigrp_hello.c ++++ b/eigrpd/eigrp_hello.c +@@ -28,7 +28,9 @@ + #include "sockopt.h" + #include "checksum.h" + #include "vty.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + + #include "eigrpd/eigrp_structs.h" + #include "eigrpd/eigrpd.h" +diff --git a/eigrpd/eigrp_packet.c b/eigrpd/eigrp_packet.c +index 963d229bc..587eb422e 100644 +--- a/eigrpd/eigrp_packet.c ++++ b/eigrpd/eigrp_packet.c +@@ -25,8 +25,10 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" + #include "sha256.h" ++#endif + #include "lib_errors.h" + + #include "eigrpd/eigrp_structs.h" +@@ -88,8 +90,12 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, + struct key *key = NULL; + struct keychain *keychain; + ++ + unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN]; ++#ifdef CRYPTO_OPENSSL ++#elif CRYPTO_INTERNAL + MD5_CTX ctx; ++#endif + uint8_t *ibuf; + size_t backup_get, backup_end; + struct TLV_MD5_Authentication_Type *auth_TLV; +@@ -112,6 +118,9 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, + return EIGRP_AUTH_TYPE_NONE; + } + ++#ifdef CRYPTO_OPENSSL ++//TBD when this is fixed in upstream ++#elif CRYPTO_INTERNAL + memset(&ctx, 0, sizeof(ctx)); + MD5Init(&ctx); + +@@ -139,7 +148,7 @@ int eigrp_make_md5_digest(struct eigrp_interface *ei, struct stream *s, + } + + MD5Final(digest, &ctx); +- ++#endif + /* Append md5 digest to the end of the stream. */ + memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_MD5_LEN); + +@@ -155,7 +164,10 @@ int eigrp_check_md5_digest(struct stream *s, + struct TLV_MD5_Authentication_Type *authTLV, + struct eigrp_neighbor *nbr, uint8_t flags) + { ++#ifdef CRYPTO_OPENSSL ++#elif CRYPTO_INTERNAL + MD5_CTX ctx; ++#endif + unsigned char digest[EIGRP_AUTH_TYPE_MD5_LEN]; + unsigned char orig[EIGRP_AUTH_TYPE_MD5_LEN]; + struct key *key = NULL; +@@ -196,6 +208,9 @@ int eigrp_check_md5_digest(struct stream *s, + return 0; + } + ++#ifdef CRYPTO_OPENSSL ++ //TBD when eigrpd crypto is fixed in upstream ++#elif CRYPTO_INTERNAL + memset(&ctx, 0, sizeof(ctx)); + MD5Init(&ctx); + +@@ -223,6 +238,7 @@ int eigrp_check_md5_digest(struct stream *s, + } + + MD5Final(digest, &ctx); ++#endif + + /* compare the two */ + if (memcmp(orig, digest, EIGRP_AUTH_TYPE_MD5_LEN) != 0) { +@@ -247,7 +263,11 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, + unsigned char digest[EIGRP_AUTH_TYPE_SHA256_LEN]; + unsigned char buffer[1 + PLAINTEXT_LENGTH + 45 + 1] = {0}; + ++#ifdef CRYPTO_OPENSSL ++ //TBD when eigrpd crypto is fixed in upstream ++#elif CRYPTO_INTERNAL + HMAC_SHA256_CTX ctx; ++#endif + void *ibuf; + size_t backup_get, backup_end; + struct TLV_SHA256_Authentication_Type *auth_TLV; +@@ -276,6 +296,9 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, + + inet_ntop(AF_INET, &ei->address.u.prefix4, source_ip, PREFIX_STRLEN); + ++#ifdef CRYPTO_OPENSSL ++ //TBD when eigrpd crypto is fixed in upstream ++#elif CRYPTO_INTERNAL + memset(&ctx, 0, sizeof(ctx)); + buffer[0] = '\n'; + memcpy(buffer + 1, key, strlen(key->string)); +@@ -284,7 +307,7 @@ int eigrp_make_sha256_digest(struct eigrp_interface *ei, struct stream *s, + 1 + strlen(key->string) + strlen(source_ip)); + HMAC__SHA256_Update(&ctx, ibuf, strlen(ibuf)); + HMAC__SHA256_Final(digest, &ctx); +- ++#endif + + /* Put hmac-sha256 digest to it's place */ + memcpy(auth_TLV->digest, digest, EIGRP_AUTH_TYPE_SHA256_LEN); +diff --git a/eigrpd/eigrp_query.c b/eigrpd/eigrp_query.c +index 0e206cded..4b3f4e082 100644 +--- a/eigrpd/eigrp_query.c ++++ b/eigrpd/eigrp_query.c +@@ -23,7 +23,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + + #include "eigrpd/eigrp_structs.h" +diff --git a/eigrpd/eigrp_reply.c b/eigrpd/eigrp_reply.c +index aae89e832..1fb1f404d 100644 +--- a/eigrpd/eigrp_reply.c ++++ b/eigrpd/eigrp_reply.c +@@ -27,7 +27,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + #include "keychain.h" + #include "plist.h" +diff --git a/eigrpd/eigrp_siaquery.c b/eigrpd/eigrp_siaquery.c +index 71486a1f6..430e8ce71 100644 +--- a/eigrpd/eigrp_siaquery.c ++++ b/eigrpd/eigrp_siaquery.c +@@ -23,7 +23,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + + #include "eigrpd/eigrp_structs.h" +diff --git a/eigrpd/eigrp_siareply.c b/eigrpd/eigrp_siareply.c +index 6c8c1ef58..b16e0fcfc 100644 +--- a/eigrpd/eigrp_siareply.c ++++ b/eigrpd/eigrp_siareply.c +@@ -22,7 +22,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + + #include "eigrpd/eigrp_structs.h" +diff --git a/eigrpd/eigrp_snmp.c b/eigrpd/eigrp_snmp.c +index 492ef3e71..5618c3f2b 100644 +--- a/eigrpd/eigrp_snmp.c ++++ b/eigrpd/eigrp_snmp.c +@@ -27,7 +27,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "keychain.h" + #include "smux.h" + +diff --git a/eigrpd/eigrp_update.c b/eigrpd/eigrp_update.c +index a056267bf..3dc8d0e56 100644 +--- a/eigrpd/eigrp_update.c ++++ b/eigrpd/eigrp_update.c +@@ -27,7 +27,9 @@ + #include "log.h" + #include "sockopt.h" + #include "checksum.h" ++#ifdef CRYPTO_INTERNAL + #include "md5.h" ++#endif + #include "vty.h" + #include "plist.h" + #include "plist_int.h" +-- +2.41.0 + diff --git a/0004-fips-mode.patch b/0004-fips-mode.patch index deedf14..4d08765 100644 --- a/0004-fips-mode.patch +++ b/0004-fips-mode.patch @@ -1,8 +1,63 @@ +From 730598d8a4c1bd32d0e4fc0e76be926314a6f57b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= +Date: Sun, 8 Oct 2023 11:24:43 +0200 +Subject: [PATCH 4/5] fips mode + +--- + isisd/isis_circuit.c | 4 ++++ + isisd/isisd.c | 4 ++++ + lib/zebra.h | 1 + + ospfd/ospf_vty.c | 24 ++++++++++++++++++++++++ + ripd/rip_cli.c | 6 ++++++ + 5 files changed, 39 insertions(+) + +diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c +index feab45123..f02bae968 100644 +--- a/isisd/isis_circuit.c ++++ b/isisd/isis_circuit.c +@@ -1542,6 +1542,10 @@ ferr_r isis_circuit_passwd_set(struct isis_circuit *circuit, + return ferr_code_bug( + "circuit password too long (max 254 chars)"); + ++ //When in FIPS mode, the password never gets set in MD5 ++ if((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && FIPS_mode()) ++ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled"); ++ + circuit->passwd.len = len; + strlcpy((char *)circuit->passwd.passwd, passwd, + sizeof(circuit->passwd.passwd)); +diff --git a/isisd/isisd.c b/isisd/isisd.c +index ea304ba5e..67f6e253a 100644 +--- a/isisd/isisd.c ++++ b/isisd/isisd.c +@@ -3036,6 +3036,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level, + if (len > 254) + return -1; + ++ //When in FIPS mode, the password never get set in MD5 ++ if ((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && (FIPS_mode())) ++ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled"); ++ + modified.len = len; + strlcpy((char *)modified.passwd, passwd, + sizeof(modified.passwd)); +diff --git a/lib/zebra.h b/lib/zebra.h +index ecc87f58f..5cb716759 100644 +--- a/lib/zebra.h ++++ b/lib/zebra.h +@@ -90,6 +90,7 @@ + #ifdef CRYPTO_OPENSSL + #include + #include ++#include + #endif + + #include "openbsd-tree.h" diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c -index 631465f..e084ff3 100644 +index 5cd70c7c2..0b8dbaa73 100644 --- a/ospfd/ospf_vty.c +++ b/ospfd/ospf_vty.c -@@ -1136,6 +1136,11 @@ DEFUN (ospf_area_vlink, +@@ -1069,6 +1069,11 @@ DEFUN (ospf_area_vlink, if (argv_find(argv, argc, "message-digest", &idx)) { /* authentication message-digest */ @@ -14,7 +69,7 @@ index 631465f..e084ff3 100644 vl_config.auth_type = OSPF_AUTH_CRYPTOGRAPHIC; } else if (argv_find(argv, argc, "null", &idx)) { /* "authentication null" */ -@@ -1993,6 +1998,15 @@ DEFUN (ospf_area_authentication_message_digest, +@@ -1974,6 +1979,15 @@ DEFUN (ospf_area_authentication_message_digest, ? OSPF_AUTH_NULL : OSPF_AUTH_CRYPTOGRAPHIC; @@ -30,7 +85,7 @@ index 631465f..e084ff3 100644 return CMD_SUCCESS; } -@@ -6665,6 +6679,11 @@ DEFUN (ip_ospf_authentication_args, +@@ -7419,6 +7433,11 @@ DEFUN (ip_ospf_authentication_args, /* Handle message-digest authentication */ if (argv[idx_encryption]->arg[0] == 'm') { @@ -42,7 +97,7 @@ index 631465f..e084ff3 100644 SET_IF_PARAM(params, auth_type); params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC; return CMD_SUCCESS; -@@ -6971,6 +6990,11 @@ DEFUN (ip_ospf_message_digest_key, +@@ -7725,6 +7744,11 @@ DEFUN (ip_ospf_message_digest_key, "The OSPF password (key)\n" "Address of interface\n") { @@ -54,41 +109,11 @@ index 631465f..e084ff3 100644 VTY_DECLVAR_CONTEXT(interface, ifp); struct crypt_key *ck; uint8_t key_id; -diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c -index 81b4b39..cce33d9 100644 ---- a/isisd/isis_circuit.c -+++ b/isisd/isis_circuit.c -@@ -1318,6 +1318,10 @@ static int isis_circuit_passwd_set(struct isis_circuit *circuit, - return ferr_code_bug( - "circuit password too long (max 254 chars)"); - -+ //When in FIPS mode, the password never gets set in MD5 -+ if((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && FIPS_mode()) -+ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled"); -+ - circuit->passwd.len = len; - strlcpy((char *)circuit->passwd.passwd, passwd, - sizeof(circuit->passwd.passwd)); -diff --git a/isisd/isisd.c b/isisd/isisd.c -index 419127c..a6c36af 100644 ---- a/isisd/isisd.c -+++ b/isisd/isisd.c -@@ -1638,6 +1638,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level, - if (len > 254) - return -1; - -+ //When in FIPS mode, the password never get set in MD5 -+ if ((passwd_type == ISIS_PASSWD_TYPE_HMAC_MD5) && (FIPS_mode())) -+ return ferr_cfg_invalid("FIPS mode is enabled, md5 authentication is disabled"); -+ - modified.len = len; - strlcpy((char *)modified.passwd, passwd, - sizeof(modified.passwd)); diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c -index 5bb81ef..02a09ef 100644 +index 097c708ab..854a16e4e 100644 --- a/ripd/rip_cli.c +++ b/ripd/rip_cli.c -@@ -796,6 +796,12 @@ DEFPY (ip_rip_authentication_mode, +@@ -876,6 +876,12 @@ DEFPY_YANG (ip_rip_authentication_mode, value = "20"; } @@ -101,15 +126,6 @@ index 5bb81ef..02a09ef 100644 nb_cli_enqueue_change(vty, "./authentication-scheme/mode", NB_OP_MODIFY, strmatch(mode, "md5") ? "md5" : "plain-text"); if (strmatch(mode, "md5")) -diff --git a/lib/zebra.h b/lib/zebra.h -index 53ae5b4..930307f 100644 ---- a/lib/zebra.h -+++ b/lib/zebra.h -@@ -114,6 +114,7 @@ - #ifdef CRYPTO_OPENSSL - #include - #include -+#include - #endif +-- +2.41.0 - #include "openbsd-tree.h" diff --git a/0005-remove-grpc-test.patch b/0005-remove-grpc-test.patch index c669b74..3643f6f 100644 --- a/0005-remove-grpc-test.patch +++ b/0005-remove-grpc-test.patch @@ -1,10 +1,19 @@ +From a41d8382ba6b5ba0edf1887e65bbd21676ca9be4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= +Date: Sun, 8 Oct 2023 11:26:25 +0200 +Subject: [PATCH 5/5] remove grpc test + +--- + tests/lib/subdir.am | 11 ----------- + 1 file changed, 11 deletions(-) + diff --git a/tests/lib/subdir.am b/tests/lib/subdir.am -index 7b5eaa4..5c82f69 100644 +index 6c1be5020..2ac3d508e 100644 --- a/tests/lib/subdir.am +++ b/tests/lib/subdir.am -@@ -18,18 +18,6 @@ tests_lib_test_frrscript_SOURCES = tests/lib/test_frrscript.c - EXTRA_DIST += tests/lib/test_frrscript.py - +@@ -24,17 +24,6 @@ copy_script: tests/lib/script1.lua + test -e tests/lib/script1.lua || \ + $(INSTALL_SCRIPT) $< tests/lib/script1.lua -############################################################################## -GRPC_TESTS_LDADD = staticd/libstatic.a grpc/libfrrgrpc_pb.la -lgrpc++ -lprotobuf $(ALL_TESTS_LDADD) $(LIBYANG_LIBS) -lm @@ -17,7 +26,9 @@ index 7b5eaa4..5c82f69 100644 -tests_lib_test_grpc_LDADD = $(GRPC_TESTS_LDADD) -tests_lib_test_grpc_SOURCES = tests/lib/test_grpc.cpp - -- + ############################################################################## if ZEROMQ - check_PROGRAMS += tests/lib/test_zmq +-- +2.41.0 + diff --git a/frr.spec b/frr.spec index d20127b..fac7f98 100644 --- a/frr.spec +++ b/frr.spec @@ -8,7 +8,7 @@ %bcond_without selinux Name: frr -Version: 8.5.2 +Version: 9.0.1 Release: 1%{?dist} Summary: Routing daemon License: GPLv2+ @@ -21,7 +21,7 @@ Source3: frr.fc Source4: frr.te Source5: frr.if -Patch0000: 0000-remove-babeld-and-ldpd.patch +Patch0000: 0001-remove-babeld-and-ldpd.patch Patch0002: 0002-enable-openssl.patch Patch0003: 0003-disable-eigrp-crypto.patch Patch0004: 0004-fips-mode.patch @@ -50,6 +50,7 @@ BuildRequires: pam-devel BuildRequires: patch BuildRequires: perl-XML-LibXML BuildRequires: perl-generators +BuildRequires: protobuf-c-devel BuildRequires: python3-devel BuildRequires: python3-pytest BuildRequires: python3-sphinx