Skip to content

Commit 15291dc

Browse files
committed
Update parameter names
1 parent 9077f2f commit 15291dc

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

core/src/main/java/org/bouncycastle/pqc/crypto/util/PublicKeyFactory.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -615,23 +615,23 @@ static class MLKEMConverter
615615
AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Object defaultParams)
616616
throws IOException
617617
{
618-
MLKEMParameters kyberParameters = Utils.mlkemParamsLookup(keyInfo.getAlgorithm().getAlgorithm());
618+
MLKEMParameters parameters = Utils.mlkemParamsLookup(keyInfo.getAlgorithm().getAlgorithm());
619619

620620
try
621621
{
622622
ASN1Primitive obj = keyInfo.parsePublicKey();
623623
KyberPublicKey kyberKey = KyberPublicKey.getInstance(obj);
624624

625-
return new MLKEMPublicKeyParameters(kyberParameters, kyberKey.getT(), kyberKey.getRho());
625+
return new MLKEMPublicKeyParameters(parameters, kyberKey.getT(), kyberKey.getRho());
626626
}
627627
catch (Exception e)
628628
{
629629
// we're a raw encoding
630-
return new MLKEMPublicKeyParameters(kyberParameters, keyInfo.getPublicKeyData().getOctets());
630+
return new MLKEMPublicKeyParameters(parameters, keyInfo.getPublicKeyData().getOctets());
631631
}
632632
}
633633

634-
static MLKEMPublicKeyParameters getPublicKeyParams(MLKEMParameters dilithiumParams, ASN1BitString publicKeyData)
634+
static MLKEMPublicKeyParameters getPublicKeyParams(MLKEMParameters parameters, ASN1BitString publicKeyData)
635635
{
636636
try
637637
{
@@ -640,21 +640,21 @@ static MLKEMPublicKeyParameters getPublicKeyParams(MLKEMParameters dilithiumPara
640640
{
641641
ASN1Sequence keySeq = ASN1Sequence.getInstance(obj);
642642

643-
return new MLKEMPublicKeyParameters(dilithiumParams,
643+
return new MLKEMPublicKeyParameters(parameters,
644644
ASN1OctetString.getInstance(keySeq.getObjectAt(0)).getOctets(),
645645
ASN1OctetString.getInstance(keySeq.getObjectAt(1)).getOctets());
646646
}
647647
else
648648
{
649649
byte[] encKey = ASN1OctetString.getInstance(obj).getOctets();
650650

651-
return new MLKEMPublicKeyParameters(dilithiumParams, encKey);
651+
return new MLKEMPublicKeyParameters(parameters, encKey);
652652
}
653653
}
654654
catch (Exception e)
655655
{
656656
// we're a raw encoding
657-
return new MLKEMPublicKeyParameters(dilithiumParams, publicKeyData.getOctets());
657+
return new MLKEMPublicKeyParameters(parameters, publicKeyData.getOctets());
658658
}
659659
}
660660
}
@@ -737,7 +737,7 @@ AsymmetricKeyParameter getPublicKeyParameters(SubjectPublicKeyInfo keyInfo, Obje
737737
return getPublicKeyParams(dilithiumParams, keyInfo.getPublicKeyData());
738738
}
739739

740-
static MLDSAPublicKeyParameters getPublicKeyParams(MLDSAParameters dilithiumParams, ASN1BitString publicKeyData)
740+
static MLDSAPublicKeyParameters getPublicKeyParams(MLDSAParameters mlDsaParams, ASN1BitString publicKeyData)
741741
{
742742
try
743743
{
@@ -746,21 +746,21 @@ static MLDSAPublicKeyParameters getPublicKeyParams(MLDSAParameters dilithiumPara
746746
{
747747
ASN1Sequence keySeq = ASN1Sequence.getInstance(obj);
748748

749-
return new MLDSAPublicKeyParameters(dilithiumParams,
749+
return new MLDSAPublicKeyParameters(mlDsaParams,
750750
ASN1OctetString.getInstance(keySeq.getObjectAt(0)).getOctets(),
751751
ASN1OctetString.getInstance(keySeq.getObjectAt(1)).getOctets());
752752
}
753753
else
754754
{
755755
byte[] encKey = ASN1OctetString.getInstance(obj).getOctets();
756756

757-
return new MLDSAPublicKeyParameters(dilithiumParams, encKey);
757+
return new MLDSAPublicKeyParameters(mlDsaParams, encKey);
758758
}
759759
}
760760
catch (Exception e)
761761
{
762762
// we're a raw encoding
763-
return new MLDSAPublicKeyParameters(dilithiumParams, publicKeyData.getOctets());
763+
return new MLDSAPublicKeyParameters(mlDsaParams, publicKeyData.getOctets());
764764
}
765765
}
766766
}

0 commit comments

Comments
 (0)