Mirrors/sshj
1
0
Fork 0
mirror of https://github.com/hierynomus/sshj.git synced 2025-12-06 07:10:53 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #165 from Boris-de/fix_bsize_bug

Browse Source 
Fix bsize bug
This commit is contained in:
Jeroen van Erp
2015-01-12 09:51:06 +01:00
parent efb2c547f9 73de5b7b08
commit 3ade3977ef
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/net/schmizz/sshj/transport/mac/BaseMAC.java
View File

@@ -41,12 +41,12 @@ public class BaseMAC
@Override
public byte[] doFinal() {
return mac.doFinal();
return resizeToHashSize(mac.doFinal());
}
@Override
public byte[] doFinal(byte[] input) {
return mac.doFinal(input);
return resizeToHashSize(mac.doFinal(input));
}
@Override
@@ -62,6 +62,15 @@ public class BaseMAC
}
}
private byte[] resizeToHashSize(byte[] buf) {
if (bsize == defbsize)
return buf;
byte[] result = new byte[bsize];
System.arraycopy(buf, 0, result, 0, bsize);
return result;
}
@Override
public int getBlockSize() {
return bsize;

2
src/test/java/net/schmizz/sshj/transport/mac/HMACMD596Test.java
View File

@@ -30,7 +30,6 @@ public class HMACMD596Test {
private static final String EXPECTED_HMAC = "dff33c507463f9cf088a5ce8";
@Test
@Ignore
public void testUpdateWithDoFinal() {
HMACMD596 hmac = initHmac();
hmac.update(PLAIN_TEXT);
@@ -38,7 +37,6 @@ public class HMACMD596Test {
}
@Test
@Ignore
public void testDoFinalWithInput() {
HMACMD596 hmac = initHmac();
assertThat(Hex.toHexString(hmac.doFinal(PLAIN_TEXT)),

2
src/test/java/net/schmizz/sshj/transport/mac/HMACSHA196Test.java
View File

@@ -30,7 +30,6 @@ public class HMACSHA196Test {
private static final String EXPECTED_HMAC = "24ddeed57ad91465c5b59dce";
@Test
@Ignore
public void testUpdateWithDoFinal() {
HMACSHA196 hmac = initHmac();
hmac.update(PLAIN_TEXT);
@@ -38,7 +37,6 @@ public class HMACSHA196Test {
}
@Test
@Ignore
public void testDoFinalWithInput() {
HMACSHA196 hmac = initHmac();
assertThat(Hex.toHexString(hmac.doFinal(PLAIN_TEXT)), is(EXPECTED_HMAC));