Update bouncy castle fips to version 2.0.0

vitali-pr · vitali-pr · commit 3f4e39174719 · 2024-09-16T08:31:02.000+03:00
DEVSIX-8589
diff --git a/bouncy-castle-fips-adapter/pom.xml b/bouncy-castle-fips-adapter/pom.xml
@@ -14,8 +14,8 @@
   <url>https://itextpdf.com/</url>
 
   <properties>
-    <bouncycastleFips.version>1.0.2.4</bouncycastleFips.version>
-    <bouncycastlePkixFips.version>1.0.7</bouncycastlePkixFips.version>
+    <bouncycastleFips.version>2.0.0</bouncycastleFips.version>
+    <bouncycastlePkixFips.version>2.0.7</bouncycastlePkixFips.version>
     <sonar.coverage.exclusions>**/*</sonar.coverage.exclusions>
     <sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
   </properties>
diff --git a/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/BouncyCastleFipsFactory.java b/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/BouncyCastleFipsFactory.java
@@ -280,8 +280,6 @@ This file is part of the iText (R) project.
 import org.bouncycastle.asn1.ASN1UTCTime;
 import org.bouncycastle.asn1.DERIA5String;
 import org.bouncycastle.asn1.DEROctetString;
-import org.bouncycastle.asn1.DEROutputStream;
-import org.bouncycastle.asn1.DLOutputStream;
 import org.bouncycastle.asn1.cms.Attribute;
 import org.bouncycastle.asn1.cms.ContentInfo;
 import org.bouncycastle.asn1.esf.SigPolicyQualifierInfo;
@@ -613,12 +611,7 @@ public IASN1OutputStream createASN1OutputStream(OutputStream stream) {
      */
     @Override
     public IASN1OutputStream createASN1OutputStream(OutputStream outputStream, String asn1Encoding) {
-        if ("DER".equals(asn1Encoding)) {
-            return new ASN1OutputStreamBCFips(new DEROutputStream(outputStream));
-        } else {
-            return new ASN1OutputStreamBCFips("DL".equals(asn1Encoding) ? new DLOutputStream(outputStream)
-                    : new ASN1OutputStream(outputStream));
-        }
+        return new ASN1OutputStreamBCFips(ASN1OutputStream.create(outputStream, asn1Encoding));
     }
 
     /**
diff --git a/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/BouncyCastleFipsTestConstantsFactory.java b/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/BouncyCastleFipsTestConstantsFactory.java
@@ -32,6 +32,6 @@ class BouncyCastleFipsTestConstantsFactory implements IBouncyCastleTestConstants
 
     @Override
     public String getCertificateInfoTestConst() {
-        return "DEF length 8 object truncated by 4";
+        return "corrupted stream - out of bounds length found: 8 >= 6";
     }
 }
diff --git a/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/asn1/ASN1OutputStreamBCFips.java b/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/asn1/ASN1OutputStreamBCFips.java
@@ -42,7 +42,7 @@ public class ASN1OutputStreamBCFips implements IASN1OutputStream {
      * @param stream OutputStream to create {@link ASN1OutputStream} to be wrapped
      */
     public ASN1OutputStreamBCFips(OutputStream stream) {
-        this.stream = new ASN1OutputStream(stream);
+        this.stream = ASN1OutputStream.create(stream);
     }
 
     /**
diff --git a/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/tsp/TimeStampRequestGeneratorBCFips.java b/bouncy-castle-fips-adapter/src/main/java/com/itextpdf/bouncycastlefips/tsp/TimeStampRequestGeneratorBCFips.java
@@ -29,6 +29,7 @@ This file is part of the iText (R) project.
 
 import java.math.BigInteger;
 import java.util.Objects;
+import org.bouncycastle.asn1.ASN1ObjectIdentifier;
 import org.bouncycastle.tsp.TimeStampRequestGenerator;
 
 /**
@@ -68,7 +69,7 @@ public void setCertReq(boolean var1) {
      */
     @Override
     public void setReqPolicy(String reqPolicy) {
-        requestGenerator.setReqPolicy(reqPolicy);
+        requestGenerator.setReqPolicy(new ASN1ObjectIdentifier(reqPolicy));
     }
 
     /**
diff --git a/sharpenConfiguration.xml b/sharpenConfiguration.xml
@@ -223,6 +223,7 @@
                 <file path="com/itextpdf/bouncycastle/tsp/TimeStampTokenGeneratorBC.java"/>
                 <file path="com/itextpdf/bouncycastle/tsp/TimeStampTokenBC.java"/>
                 <file path="com/itextpdf/bouncycastlefips/BouncyCastleFipsFactory.java"/>
+                <file path="com/itextpdf/bouncycastlefips/BouncyCastleFipsTestConstantsFactory.java"/>
                 <file path="com/itextpdf/bouncycastlefips/asn1/ASN1IntegerBCFips.java"/>
                 <file path="com/itextpdf/bouncycastlefips/asn1/ASN1OctetStringBCFips.java"/>
                 <file path="com/itextpdf/bouncycastlefips/asn1/ASN1SequenceBCFips.java"/>
diff --git a/sign/src/test/java/com/itextpdf/signatures/DigestAlgorithmsManualTest.java b/sign/src/test/java/com/itextpdf/signatures/DigestAlgorithmsManualTest.java
@@ -22,7 +22,10 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.signatures;
 
+import com.itextpdf.signatures.logs.SignLogMessageConstant;
 import com.itextpdf.test.ExtendedITextTest;
+import com.itextpdf.test.annotations.LogMessage;
+import com.itextpdf.test.annotations.LogMessages;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -32,7 +35,7 @@ This file is part of the iText (R) project.
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Tag;
 
-@Tag("UnitTest")
+@Tag("BouncyCastleUnitTest")
 public class DigestAlgorithmsManualTest extends ExtendedITextTest {
 
     @Test
@@ -54,4 +57,13 @@ public void digestSHA256SUNTest() throws GeneralSecurityException, IOException {
                         119, -42, -59, -31, 121, -87, -82, -45, 119, 61, 92, 110, -99, 105, 4, 97, 12, 127, -62};
         Assertions.assertArrayEquals(expected, hash);
     }
+
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = SignLogMessageConstant.ALGORITHM_NOT_FROM_SPEC, ignore = true)})
+    @Test
+    public void notAllowedNameGetAllowedDigestTest() {
+        String name = "SM3";
+        String oid = "1.2.156.10197.1.401";
+        Assertions.assertEquals(oid, DigestAlgorithms.getAllowedDigest(name));
+    }
 }
diff --git a/sign/src/test/java/com/itextpdf/signatures/DigestAlgorithmsTest.java b/sign/src/test/java/com/itextpdf/signatures/DigestAlgorithmsTest.java
@@ -80,13 +80,4 @@ public void notAllowedOidGetDigestTest() {
         String oid = "1.2.156.10197.1.401";
         Assertions.assertEquals(FIPS_MODE ? oid : name, DigestAlgorithms.getDigest(oid));
     }
-
-    @LogMessages(messages = {
-            @LogMessage(messageTemplate = SignLogMessageConstant.ALGORITHM_NOT_FROM_SPEC, ignore = true)})
-    @Test
-    public void notAllowedNameGetAllowedDigestTest() {
-        String name = "SM3";
-        String oid = "1.2.156.10197.1.401";
-        Assertions.assertEquals(FIPS_MODE ? null : oid, DigestAlgorithms.getAllowedDigest(name));
-    }
 }
diff --git a/sign/src/test/java/com/itextpdf/signatures/PdfPKCS7ManuallyPortedTest.java b/sign/src/test/java/com/itextpdf/signatures/PdfPKCS7ManuallyPortedTest.java
@@ -66,4 +66,14 @@ public void verifyRsaPssSha3SignatureTest() throws IOException, GeneralSecurityE
         verifyIsoExtensionExample("RSASSA-PSS", "sample-pss-sha3_256.pdf");
     }
 
+    @Test
+    public void verifyEd448SignatureTest() throws IOException, GeneralSecurityException {
+        // Ed448 is not available in BCFIPS approved mode
+        if (BOUNCY_CASTLE_FACTORY.isInApprovedOnlyMode()) {
+            Assertions.assertThrows(PdfException.class,
+                    () -> verifyIsoExtensionExample("Ed448", "sample-ed448-shake256.pdf"));
+        } else {
+            verifyIsoExtensionExample("Ed448", "sample-ed448-shake256.pdf");
+        }
+    }
 }
diff --git a/sign/src/test/java/com/itextpdf/signatures/PdfPKCS7Test.java b/sign/src/test/java/com/itextpdf/signatures/PdfPKCS7Test.java
@@ -348,17 +348,6 @@ public void getEncodedPkcs7WithRevocationInfoTest() throws NoSuchAlgorithmExcept
         Assertions.assertEquals(serializedAsString(bytes), serializedAsString(cmpBytes));
     }
 
-    @Test
-    public void verifyEd448SignatureTest() throws IOException, GeneralSecurityException {
-        // SHAKE256 is not available in BCFIPS
-        if ("BCFIPS".equals(BOUNCY_CASTLE_FACTORY.getProviderName())) {
-            Assertions.assertThrows(PdfException.class,
-                    () -> verifyIsoExtensionExample("Ed448", "sample-ed448-shake256.pdf"));
-        } else {
-            verifyIsoExtensionExample("Ed448", "sample-ed448-shake256.pdf");
-        }
-    }
-
     @Test
     public void verifyNistECDSASha2SignatureTest() throws IOException, GeneralSecurityException {
         verifyIsoExtensionExample("SHA256withECDSA", "sample-nistp256-sha256.pdf");
diff --git a/sign/src/test/java/com/itextpdf/signatures/sign/IsoSignatureExtensionsRoundtripTest.java b/sign/src/test/java/com/itextpdf/signatures/sign/IsoSignatureExtensionsRoundtripTest.java
@@ -60,7 +60,6 @@ This file is part of the iText (R) project.
 import java.nio.file.Paths;
 import java.security.GeneralSecurityException;
 import java.security.KeyException;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.Security;
 import java.security.cert.Certificate;
@@ -107,13 +106,7 @@ public void testEd25519() throws Exception {
 
     @Test
     public void testEd448() throws Exception {
-        if ("BC".equals(BOUNCY_CASTLE_FACTORY.getProviderName())) {
-            doRoundTrip("ed448", DigestAlgorithms.SHAKE256, EdECObjectIdentifiers.id_Ed448);
-        } else {
-            // SHAKE256 is currently not supported in BCFIPS
-            Exception e = Assertions.assertThrows(NoSuchAlgorithmException.class, () ->
-                    doRoundTrip("ed448", DigestAlgorithms.SHAKE256, EdECObjectIdentifiers.id_Ed448));
-        }
+        doRoundTrip("ed448", DigestAlgorithms.SHAKE256, EdECObjectIdentifiers.id_Ed448);
     }
 
     @Test
@@ -241,14 +234,8 @@ public void testEd25519ExtensionDeclarations() throws Exception {
     @Test
     public void testEd448ExtensionDeclarations() throws Exception {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
-        if ("BC".equals(BOUNCY_CASTLE_FACTORY.getProviderName())) {
-            doSign("ed448", DigestAlgorithms.SHAKE256, null, baos);
-            checkIsoExtensions(baos.toByteArray(), Arrays.asList(32001, 32002));
-        } else {
-            // SHAKE256 is currently not supported in BCFIPS
-            Exception e = Assertions.assertThrows(NoSuchAlgorithmException.class, () ->
-                    doSign("ed448", DigestAlgorithms.SHAKE256, null, baos));
-        }
+        doSign("ed448", DigestAlgorithms.SHAKE256, null, baos);
+        checkIsoExtensions(baos.toByteArray(), Arrays.asList(32001, 32002));
     }
 
     @Test
diff --git a/sign/src/test/java/com/itextpdf/signatures/sign/PadesTwoPhaseSigningLevelsTest.java b/sign/src/test/java/com/itextpdf/signatures/sign/PadesTwoPhaseSigningLevelsTest.java
@@ -100,7 +100,8 @@ public void setUp(String signAlgorithm) {
     }
 
     public static Iterable<Object[]> createParameters() {
-        return Arrays.asList(new Object[] {true, DigestAlgorithms.SHA256, "RSA", 1},
+        return Arrays.asList(
+                new Object[] {true, DigestAlgorithms.SHA256, "RSA", 1},
                 new Object[] {false, DigestAlgorithms.SHA256, "RSASSA", 2},
                 new Object[] {false, DigestAlgorithms.SHAKE256, "ED448", 3},
                 new Object[] {false, DigestAlgorithms.SHA3_384, "RSA", 4});
@@ -131,12 +132,6 @@ public void twoStepSigningBaselineBTest(Boolean useTempFolder, String digestAlgo
         }
 
         try (ByteArrayOutputStream preparedDoc = new ByteArrayOutputStream()) {
-            if (DigestAlgorithms.SHAKE256.equals(digestAlgorithm) && FIPS_MODE) {
-                Assertions.assertThrows(NoSuchAlgorithmException.class, () ->
-                        twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain, digestAlgorithm,
-                                new PdfReader(srcFileName), preparedDoc, createSignerProperties()));
-                return;
-            }
             CMSContainer container = twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain,
                     digestAlgorithm, new PdfReader(srcFileName), preparedDoc, createSignerProperties());
 
@@ -186,12 +181,6 @@ public void twoStepSigningBaselineTTest(Boolean useTempFolder, String digestAlgo
         }
 
         try (ByteArrayOutputStream preparedDoc = new ByteArrayOutputStream()) {
-            if (DigestAlgorithms.SHAKE256.equals(digestAlgorithm) && FIPS_MODE) {
-                Assertions.assertThrows(NoSuchAlgorithmException.class, () ->
-                        twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain, digestAlgorithm,
-                                new PdfReader(srcFileName), preparedDoc, createSignerProperties()));
-                return;
-            }
             CMSContainer container = twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain,
                     digestAlgorithm, new PdfReader(srcFileName), preparedDoc, createSignerProperties());
 
@@ -215,7 +204,8 @@ public void twoStepSigningBaselineTTest(Boolean useTempFolder, String digestAlgo
     public void twoStepSigningBaselineLTTest(Boolean useTempFolder, String digestAlgorithm, String signAlgorithm,
             Integer comparisonPdfId) throws Exception {
         setUp(signAlgorithm);
-        String fileName = "twoStepSigningBaselineLTTest" + comparisonPdfId + (FIPS_MODE && "RSASSA".equals(signAlgorithm) ? "_FIPS.pdf" : ".pdf");
+        String fileName = "twoStepSigningBaselineLTTest" + comparisonPdfId +
+                (FIPS_MODE && ("RSASSA".equals(signAlgorithm) || "ED448".equals(signAlgorithm)) ? "_FIPS.pdf" : ".pdf");
         String outFileName = destinationFolder + fileName;
         String cmpFileName = sourceFolder + "cmp_" + fileName;
         String srcFileName = sourceFolder + "helloWorldDoc.pdf";
@@ -248,12 +238,6 @@ public void twoStepSigningBaselineLTTest(Boolean useTempFolder, String digestAlg
         }
 
         try (ByteArrayOutputStream preparedDoc = new ByteArrayOutputStream()) {
-            if (DigestAlgorithms.SHAKE256.equals(digestAlgorithm) && FIPS_MODE) {
-                Assertions.assertThrows(NoSuchAlgorithmException.class, () ->
-                        twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain, digestAlgorithm,
-                                new PdfReader(srcFileName), preparedDoc, createSignerProperties()));
-                return;
-            }
             CMSContainer container = twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain,
                     digestAlgorithm, new PdfReader(srcFileName), preparedDoc, createSignerProperties());
 
@@ -277,7 +261,8 @@ public void twoStepSigningBaselineLTTest(Boolean useTempFolder, String digestAlg
     public void twoStepSigningBaselineLTATest(Boolean useTempFolder, String digestAlgorithm, String signAlgorithm,
             Integer comparisonPdfId) throws Exception {
         setUp(signAlgorithm);
-        String fileName = "twoStepSigningBaselineLTATest" + comparisonPdfId + (FIPS_MODE && "RSASSA".equals(signAlgorithm) ? "_FIPS.pdf" : ".pdf");
+        String fileName = "twoStepSigningBaselineLTATest" + comparisonPdfId +
+                (FIPS_MODE && ("RSASSA".equals(signAlgorithm) || "ED448".equals(signAlgorithm)) ? "_FIPS.pdf" : ".pdf");
         String outFileName = destinationFolder + fileName;
         String cmpFileName = sourceFolder + "cmp_" + fileName;
         String srcFileName = sourceFolder + "helloWorldDoc.pdf";
@@ -310,12 +295,6 @@ public void twoStepSigningBaselineLTATest(Boolean useTempFolder, String digestAl
         }
         
         try (ByteArrayOutputStream preparedDoc = new ByteArrayOutputStream()) {
-            if (DigestAlgorithms.SHAKE256.equals(digestAlgorithm) && FIPS_MODE) {
-                Assertions.assertThrows(NoSuchAlgorithmException.class, () ->
-                        twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain, digestAlgorithm,
-                                new PdfReader(srcFileName), preparedDoc, createSignerProperties()));
-                return;
-            }
             CMSContainer container = twoPhaseSigningHelper.createCMSContainerWithoutSignature(certChain,
                     digestAlgorithm, new PdfReader(srcFileName), preparedDoc, createSignerProperties());
 
diff --git a/sign/src/test/java/com/itextpdf/signatures/sign/PdfPadesSignerTest.java b/sign/src/test/java/com/itextpdf/signatures/sign/PdfPadesSignerTest.java
@@ -40,6 +40,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.signatures.testutils.client.TestOcspClient;
 import com.itextpdf.signatures.testutils.client.TestTsaClient;
 import com.itextpdf.test.ExtendedITextTest;
+
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Assumptions;
 import org.junit.jupiter.api.BeforeAll;
@@ -48,7 +49,6 @@ This file is part of the iText (R) project.
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
-import java.security.NoSuchAlgorithmException;
 import java.security.PrivateKey;
 import java.security.Security;
 import java.security.cert.Certificate;
@@ -275,15 +275,10 @@ public void padesSignatureEd448Test()
 
         SignerProperties signerProperties = createSignerProperties();
         PdfPadesSigner padesSigner = createPdfPadesSigner(srcFileName, outFileName);
-        if (FIPS_MODE) {
-            // SHAKE256 is currently not supported in BCFIPS
-            Exception exception = Assertions.assertThrows(NoSuchAlgorithmException.class,
-                    () -> padesSigner.signWithBaselineBProfile(signerProperties, signEdDSAChain, signEdDSAPrivateKey));
-        } else {
-            padesSigner.signWithBaselineBProfile(signerProperties, signEdDSAChain, signEdDSAPrivateKey);
-            TestSignUtils.basicCheckSignedDoc(outFileName, "Signature1");
-            Assertions.assertNull(SignaturesCompareTool.compareSignatures(outFileName, cmpFileName));
-        }
+
+        padesSigner.signWithBaselineBProfile(signerProperties, signEdDSAChain, signEdDSAPrivateKey);
+        TestSignUtils.basicCheckSignedDoc(outFileName, "Signature1");
+        Assertions.assertNull(SignaturesCompareTool.compareSignatures(outFileName, cmpFileName));
     }
 
     private SignerProperties createSignerProperties() {
diff --git a/sign/src/test/resources/com/itextpdf/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest3_FIPS.pdf b/sign/src/test/resources/com/itextpdf/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTATest3_FIPS.pdf
diff --git a/sign/src/test/resources/com/itextpdf/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest3_FIPS.pdf b/sign/src/test/resources/com/itextpdf/signatures/sign/PadesTwoPhaseSigningLevelsTest/cmp_twoStepSigningBaselineLTTest3_FIPS.pdf

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,6 @@ class BouncyCastleFipsTestConstantsFactory implements IBouncyCastleTestConstants`
`32`	`32`
`33`	`33`	`@Override`
`34`	`34`	`public String getCertificateInfoTestConst() {`
`35`		`- return "DEF length 8 object truncated by 4";`
	`35`	`+ return "corrupted stream - out of bounds length found: 8 >= 6";`
`36`	`36`	`}`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public class ASN1OutputStreamBCFips implements IASN1OutputStream {`
`42`	`42`	`* @param stream OutputStream to create {@link ASN1OutputStream} to be wrapped`
`43`	`43`	`*/`
`44`	`44`	`public ASN1OutputStreamBCFips(OutputStream stream) {`
`45`		`- this.stream = new ASN1OutputStream(stream);`
	`45`	`+ this.stream = ASN1OutputStream.create(stream);`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -80,13 +80,4 @@ public void notAllowedOidGetDigestTest() {`
`80`	`80`	`String oid = "1.2.156.10197.1.401";`
`81`	`81`	`Assertions.assertEquals(FIPS_MODE ? oid : name, DigestAlgorithms.getDigest(oid));`
`82`	`82`	`}`
`83`		`-`
`84`		`- @LogMessages(messages = {`
`85`		`- @LogMessage(messageTemplate = SignLogMessageConstant.ALGORITHM_NOT_FROM_SPEC, ignore = true)})`
`86`		`- @Test`
`87`		`- public void notAllowedNameGetAllowedDigestTest() {`
`88`		`- String name = "SM3";`
`89`		`- String oid = "1.2.156.10197.1.401";`
`90`		`- Assertions.assertEquals(FIPS_MODE ? null : oid, DigestAlgorithms.getAllowedDigest(name));`
`91`		`- }`
`92`	`83`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,4 +66,14 @@ public void verifyRsaPssSha3SignatureTest() throws IOException, GeneralSecurityE`
`66`	`66`	`verifyIsoExtensionExample("RSASSA-PSS", "sample-pss-sha3_256.pdf");`
`67`	`67`	`}`
`68`	`68`
	`69`	`+ @Test`
	`70`	`+ public void verifyEd448SignatureTest() throws IOException, GeneralSecurityException {`
	`71`	`+ // Ed448 is not available in BCFIPS approved mode`
	`72`	`+ if (BOUNCY_CASTLE_FACTORY.isInApprovedOnlyMode()) {`
	`73`	`+ Assertions.assertThrows(PdfException.class,`
	`74`	`+ () -> verifyIsoExtensionExample("Ed448", "sample-ed448-shake256.pdf"));`
	`75`	`+ } else {`
	`76`	`+ verifyIsoExtensionExample("Ed448", "sample-ed448-shake256.pdf");`
	`77`	`+ }`
	`78`	`+ }`
`69`	`79`	`}`