Skip to content

Commit 9ab564a

Browse files
samspychergrealish
authored andcommitted
Add NONEWithRsa and typecast buffer in WireHeader
1 parent 84ee0ad commit 9ab564a

File tree

2 files changed

+38
-9
lines changed

2 files changed

+38
-9
lines changed

parsec-interface-java/src/main/java/org/parallaxsecond/parsec/protocol/requests/request/common/WireHeader_1_0.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import lombok.RequiredArgsConstructor;
88

99
import java.io.IOException;
10+
import java.nio.Buffer;
1011
import java.nio.ByteBuffer;
1112
import java.nio.ByteOrder;
1213
import java.nio.channels.ReadableByteChannel;
@@ -140,7 +141,7 @@ public void writeToStream(WritableByteChannel channel) throws IOException {
140141
.putShort(status) // 34
141142
.put(reserved1) // 35
142143
.put(reserved2); // 36
143-
buf.flip();
144+
((Buffer)buf).flip();
144145

145146
channel.write(buf);
146147
}

parsec-jca-java/src/main/java/org/parallaxsecond/parsec/jce/provider/ParsecRsaSignature.java

Lines changed: 36 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,29 @@ public enum ParsecRsaSignature implements ParsecSignatureInfo {
1515
pkcs1WithHash(PsaAlgorithm.Algorithm.Hash.SHA_512),
1616
() -> MessageDigest.getInstance("SHA-512")),
1717
SHA256_WITH_RSA("SHA256withRSA",
18-
pkcs1WithHash(PsaAlgorithm.Algorithm.Hash.SHA_256),
19-
() -> MessageDigest.getInstance("SHA-256")),
18+
pkcs1WithHash(PsaAlgorithm.Algorithm.Hash.SHA_256),
19+
() -> MessageDigest.getInstance("SHA-256")),
20+
NONE_WITH_RSA("NONEwithRSA",
21+
pkcs1(),
22+
() -> new MessageDigest("NONE"){
23+
byte input0;
24+
byte[] input1;
25+
@Override
26+
protected void engineUpdate(byte input) {
27+
this.input0 = input;
28+
}
29+
30+
@Override
31+
protected void engineUpdate(byte[] input, int offset, int len) {
32+
this.input1 = input;
33+
}
34+
35+
@Override
36+
protected byte[] engineDigest() {return input1;}
37+
38+
@Override
39+
protected void engineReset() {}
40+
}),
2041

2142
;
2243

@@ -26,12 +47,19 @@ public enum ParsecRsaSignature implements ParsecSignatureInfo {
2647

2748
private static AsymmetricSignature pkcs1WithHash(PsaAlgorithm.Algorithm.Hash hash) {
2849
return AsymmetricSignature.newBuilder()
29-
.setRsaPkcs1V15Sign(AsymmetricSignature.RsaPkcs1v15Sign.newBuilder()
30-
.setHashAlg(AsymmetricSignature.SignHash.newBuilder()
31-
.setSpecific(hash)
32-
.build())
33-
.build())
34-
.build();
50+
.setRsaPkcs1V15Sign(AsymmetricSignature.RsaPkcs1v15Sign.newBuilder()
51+
.setHashAlg(AsymmetricSignature.SignHash.newBuilder()
52+
.setSpecific(hash)
53+
.build())
54+
.build())
55+
.build();
56+
}
57+
58+
private static AsymmetricSignature pkcs1() {
59+
return AsymmetricSignature.newBuilder()
60+
.setRsaPkcs1V15Sign(AsymmetricSignature.RsaPkcs1v15Sign.newBuilder()
61+
.build())
62+
.build();
3563
}
3664

3765
@Override

0 commit comments

Comments
 (0)