rpms-fedora-extras/frr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v9.1.0

Browse Source
This commit is contained in:
Zoran Peričić
2024-01-24 10:50:21 +01:00
parent 1cc9ea21ca
commit 5815fa2a24
6 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
0004-fips-mode.patch
View File

@@ -1,4 +1,4 @@
From 730598d8a4c1bd32d0e4fc0e76be926314a6f57b Mon Sep 17 00:00:00 2001
From 90d09b061feae5e39a88c0ae51f880e82d82bb18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zoran=20Peri=C4=8Di=C4=87?= <zoran.pericic@infomaas.com>
Date: Sun, 8 Oct 2023 11:24:43 +0200
Subject: [PATCH 4/5] fips mode
@@ -12,10 +12,10 @@ Subject: [PATCH 4/5] fips mode
5 files changed, 39 insertions(+)
diff --git a/isisd/isis_circuit.c b/isisd/isis_circuit.c
index feab45123..f02bae968 100644
index ffa6ad3e40..8c28b17eb2 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,
@@ -1543,6 +1543,10 @@ ferr_r isis_circuit_passwd_set(struct isis_circuit *circuit,
return ferr_code_bug(
"circuit password too long (max 254 chars)");
@@ -27,10 +27,10 @@ index feab45123..f02bae968 100644
strlcpy((char *)circuit->passwd.passwd, passwd,
sizeof(circuit->passwd.passwd));
diff --git a/isisd/isisd.c b/isisd/isisd.c
index ea304ba5e..67f6e253a 100644
index b1064d8941..fbcd097f72 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,
@@ -3040,6 +3040,10 @@ static int isis_area_passwd_set(struct isis_area *area, int level,
if (len > 254)
return -1;
@@ -42,7 +42,7 @@ index ea304ba5e..67f6e253a 100644
strlcpy((char *)modified.passwd, passwd,
sizeof(modified.passwd));
diff --git a/lib/zebra.h b/lib/zebra.h
index ecc87f58f..5cb716759 100644
index ecc87f58f1..5cb7167598 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -90,6 +90,7 @@
@@ -54,12 +54,12 @@ index ecc87f58f..5cb716759 100644
#include "openbsd-tree.h"
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index 5cd70c7c2..0b8dbaa73 100644
index 740ecb518b..d094b205b3 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -1069,6 +1069,11 @@ DEFUN (ospf_area_vlink,
if (argv_find(argv, argc, "message-digest", &idx)) {
@@ -1085,6 +1085,11 @@ DEFUN (ospf_area_vlink,
vl_config.keychain = argv[idx+1]->arg;
} else if (argv_find(argv, argc, "message-digest", &idx)) {
/* authentication message-digest */
+ if(FIPS_mode())
+ {
@@ -69,7 +69,7 @@ index 5cd70c7c2..0b8dbaa73 100644
vl_config.auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
} else if (argv_find(argv, argc, "null", &idx)) {
/* "authentication null" */
@@ -1974,6 +1979,15 @@ DEFUN (ospf_area_authentication_message_digest,
@@ -1997,6 +2002,15 @@ DEFUN (ospf_area_authentication_message_digest,
? OSPF_AUTH_NULL
: OSPF_AUTH_CRYPTOGRAPHIC;
@@ -85,7 +85,7 @@ index 5cd70c7c2..0b8dbaa73 100644
return CMD_SUCCESS;
}
@@ -7419,6 +7433,11 @@ DEFUN (ip_ospf_authentication_args,
@@ -7621,6 +7635,11 @@ DEFUN (ip_ospf_authentication_args,
/* Handle message-digest authentication */
if (argv[idx_encryption]->arg[0] == 'm') {
@@ -96,8 +96,8 @@ index 5cd70c7c2..0b8dbaa73 100644
+ }
SET_IF_PARAM(params, auth_type);
params->auth_type = OSPF_AUTH_CRYPTOGRAPHIC;
return CMD_SUCCESS;
@@ -7725,6 +7744,11 @@ DEFUN (ip_ospf_message_digest_key,
UNSET_IF_PARAM(params, keychain_name);
@@ -7949,6 +7968,11 @@ DEFUN (ip_ospf_message_digest_key,
"The OSPF password (key)\n"
"Address of interface\n")
{
@@ -110,7 +110,7 @@ index 5cd70c7c2..0b8dbaa73 100644
struct crypt_key *ck;
uint8_t key_id;
diff --git a/ripd/rip_cli.c b/ripd/rip_cli.c
index 097c708ab..854a16e4e 100644
index 097c708ab1..854a16e4e0 100644
--- a/ripd/rip_cli.c
+++ b/ripd/rip_cli.c
@@ -876,6 +876,12 @@ DEFPY_YANG (ip_rip_authentication_mode,