Merge pull request #755 from cyberstormdotmu/main

primetomas · web-flow · commit f2e334c7befe · 2025-01-17T18:02:57.000+01:00
Adding new IANA Trust Anchor 2024
diff --git a/modules/ejbca-common/src/org/ejbca/core/protocol/dnssec/DnsSecDefaults.java b/modules/ejbca-common/src/org/ejbca/core/protocol/dnssec/DnsSecDefaults.java
@@ -31,6 +31,7 @@ private DnsSecDefaults() { }
      */
     public static final String IANA_ROOT_ANCHORS_DEFAULT =
             ". IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5\n" + // old key, going to be phased out
-            ". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D"; // new key, valid from 2018-10-11
+            ". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D\n" + // old key, valid from 2018-10-11 | Will be phased out in 2024
+            ". IN DS 38696 8 2 683D2D0ACB8C9B712A1948B27F741219298D0A450D612C483AF444A4C0FB2B16";  // new key, valid from 2024-07-18
 
 }

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ private DnsSecDefaults() { }`
`31`	`31`	`*/`
`32`	`32`	`public static final String IANA_ROOT_ANCHORS_DEFAULT =`
`33`	`33`	`". IN DS 19036 8 2 49AAC11D7B6F6446702E54A1607371607A1A41855200FD2CE1CDDE32F24E8FB5\n" + // old key, going to be phased out`
`34`		`- ". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D"; // new key, valid from 2018-10-11`
	`34`	`+ ". IN DS 20326 8 2 E06D44B80B8F1D39A95C0B0D7C65D08458E880409BBC683457104237C7F8EC8D\n" + // old key, valid from 2018-10-11 \| Will be phased out in 2024`
	`35`	`+ ". IN DS 38696 8 2 683D2D0ACB8C9B712A1948B27F741219298D0A450D612C483AF444A4C0FB2B16"; // new key, valid from 2024-07-18`
`35`	`36`
`36`	`37`	`}`