Skip to content

Commit 0008093

Browse files
committed
test(keys): replace useage of old methods
1 parent a1f34af commit 0008093

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

Yubico.YubiKey/tests/integration/Yubico/YubiKey/Piv/KeyAgreeTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void KeyAgree_SharedSecret_IsValid(
4747
if (keyType is KeyType.X25519)
4848
{
4949
var testSelectedPublicKeyPeer = TestKeys.GetTestPublicKey(keyType, 2);
50-
peerPublicKey = Curve25519PublicKey.CreateFromPkcs8(testSelectedPublicKeyPeer.EncodedKey);
50+
peerPublicKey = Curve25519PublicKey.CreateFromSubjectPublicKeyInfo(testSelectedPublicKeyPeer.EncodedKey);
5151
}
5252
else
5353
{

Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/Curve25519PublicKeyTests.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void CreateCurve25519FromPkcs8EncodedKey_WithValidKey_CreatesInstance(Key
4646
var testPublicKey = TestKeys.GetTestPublicKey(keyType);
4747

4848
// Act
49-
var publicKey = Curve25519PublicKey.CreateFromPkcs8(testPublicKey.EncodedKey);
49+
var publicKey = Curve25519PublicKey.CreateFromSubjectPublicKeyInfo(testPublicKey.EncodedKey);
5050
Assert.NotNull(publicKey);
5151

5252
// Assert
@@ -63,7 +63,7 @@ public void CreateFromPkcs8_CreatesInstance(KeyType keyType)
6363
var testPublicPoint = testKey.GetPublicPoint();
6464

6565
// Act
66-
var publicKey = Curve25519PublicKey.CreateFromPkcs8(testKey.EncodedKey);
66+
var publicKey = Curve25519PublicKey.CreateFromSubjectPublicKeyInfo(testKey.EncodedKey);
6767

6868
// Assert
6969
Assert.NotNull(publicKey);

Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/ECPublicKeyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public void CreateECDsaFromPkcs8EncodedKey_WithValidKey_CreatesInstance(KeyType
4343

4444
// Act
4545
var publicKey = ecdsa.ExportSubjectPublicKeyInfo();
46-
var publicKeyParams = ECPublicKey.CreateFromPkcs8(publicKey);
46+
var publicKeyParams = ECPublicKey.CreateFromSubjectPublicKeyInfo(publicKey);
4747
var ecPublicKeyParams = publicKeyParams as ECPublicKey;
4848
Assert.NotNull(ecPublicKeyParams);
4949

Yubico.YubiKey/tests/unit/Yubico/YubiKey/Cryptography/RSAPublicKeyTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public void CreateFromPkcs8_WithValidParameters_CreatesInstance()
3535
var publicKeyPkcs = rsa.ExportSubjectPublicKeyInfo();
3636

3737
// Act
38-
var publicKey = RSAPublicKey.CreateFromPkcs8(publicKeyPkcs);
38+
var publicKey = RSAPublicKey.CreateFromSubjectPublicKeyInfo(publicKeyPkcs);
3939

4040
// Assert
4141
Assert.Null(publicKey.Parameters.D);

Yubico.YubiKey/tests/utilities/Yubico/YubiKey/TestUtilities/TestKey.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ public byte[] GetPublicPoint()
8080
}
8181

8282
return KeyDefinition is { IsEllipticCurve: true, AlgorithmOid: Oids.ECDSA }
83-
? ECPublicKey.CreateFromPkcs8(EncodedKey).PublicPoint.ToArray()
84-
: Curve25519PublicKey.CreateFromPkcs8(EncodedKey).PublicPoint.ToArray();
83+
? ECPublicKey.CreateFromSubjectPublicKeyInfo(EncodedKey).PublicPoint.ToArray()
84+
: Curve25519PublicKey.CreateFromSubjectPublicKeyInfo(EncodedKey).PublicPoint.ToArray();
8585
}
8686

8787
public IPublicKey AsPublicKey()
@@ -93,15 +93,15 @@ public IPublicKey AsPublicKey()
9393

9494
if (KeyDefinition.IsRSA)
9595
{
96-
return RSAPublicKey.CreateFromPkcs8(EncodedKey);
96+
return RSAPublicKey.CreateFromSubjectPublicKeyInfo(EncodedKey);
9797
}
9898

9999
if (KeyDefinition is { IsEllipticCurve: true, AlgorithmOid: Oids.ECDSA })
100100
{
101-
return ECPublicKey.CreateFromPkcs8(EncodedKey);
101+
return ECPublicKey.CreateFromSubjectPublicKeyInfo(EncodedKey);
102102
}
103103

104-
return Curve25519PublicKey.CreateFromPkcs8(EncodedKey);
104+
return Curve25519PublicKey.CreateFromSubjectPublicKeyInfo(EncodedKey);
105105
}
106106

107107
public byte[] GetPrivateKeyValue()

Yubico.YubiKey/tests/utilities/Yubico/YubiKey/TestUtilities/TestKeyExtensions.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,19 @@ public static PivPublicKey AsPivPublicKey(
5050
var keyDefinition = key.KeyDefinition;
5151
if (keyDefinition.IsRSA)
5252
{
53-
var rsaPublicKey = RSAPublicKey.CreateFromPkcs8(key.EncodedKey);
53+
var rsaPublicKey = RSAPublicKey.CreateFromSubjectPublicKeyInfo(key.EncodedKey);
5454
var rsaPivEncodedKey = rsaPublicKey.EncodeAsPiv();
5555
return PivPublicKey.Create(rsaPivEncodedKey, key.KeyType.GetPivAlgorithm());
5656
}
5757

5858
if (keyDefinition is { IsEllipticCurve: true, AlgorithmOid: Oids.ECDSA })
5959
{
60-
var ecPublicKey = ECPublicKey.CreateFromPkcs8(key.EncodedKey);
60+
var ecPublicKey = ECPublicKey.CreateFromSubjectPublicKeyInfo(key.EncodedKey);
6161
var ecPivEncodedKey = ecPublicKey.EncodeAsPiv();
6262
return PivPublicKey.Create(ecPivEncodedKey, key.KeyType.GetPivAlgorithm());
6363
}
6464

65-
var cvPublicKey = Curve25519PublicKey.CreateFromPkcs8(key.EncodedKey);
65+
var cvPublicKey = Curve25519PublicKey.CreateFromSubjectPublicKeyInfo(key.EncodedKey);
6666
var cvPivEncodedKey = cvPublicKey.EncodeAsPiv();
6767
return PivPublicKey.Create(cvPivEncodedKey, keyDefinition.KeyType.GetPivAlgorithm());
6868
}

0 commit comments

Comments
 (0)