added support for MAYO-N naming

Author: dghgit

pkix/src/main/java/org/bouncycastle/operator/DefaultSignatureAlgorithmIdentifierFinder.java

@@ -309,6 +309,10 @@ private static RSASSAPSSparams createPSSParams(AlgorithmIdentifier hashAlgId, in
         addAlgorithm("SHA3-512WITHPICNIC", BCObjectIdentifiers.picnic_with_sha3_512);
         addAlgorithm("SHAKE256WITHPICNIC", BCObjectIdentifiers.picnic_with_shake256);
 
+        addAlgorithm("MAYO-1", BCObjectIdentifiers.mayo1);
+        addAlgorithm("MAYO-2", BCObjectIdentifiers.mayo_2);
+        addAlgorithm("MAYO-3", BCObjectIdentifiers.mayo_3);
+        addAlgorithm("MAYO-5", BCObjectIdentifiers.mayo_5);
         addAlgorithm("MAYO_1", BCObjectIdentifiers.mayo1);
         addAlgorithm("MAYO_2", BCObjectIdentifiers.mayo_2);
         addAlgorithm("MAYO_3", BCObjectIdentifiers.mayo_3);

pkix/src/test/java/org/bouncycastle/tsp/test/PQCTSPTest.java

@@ -396,7 +396,7 @@ public void testMayo()
         X509Certificate cert = new JcaX509CertificateConverter()
             .setProvider("BC").getCertificate(certGen.build(sigGen));
 
-        ContentSigner signer = new JcaContentSignerBuilder("Mayo_1").setProvider("BCPQC").build(privKey);
+        ContentSigner signer = new JcaContentSignerBuilder("Mayo-1").setProvider("BCPQC").build(privKey);
 
         TimeStampTokenGenerator tsTokenGen = new TimeStampTokenGenerator(
             new JcaSignerInfoGeneratorBuilder(new JcaDigestCalculatorProviderBuilder().build())