Skip to content

fix: SHA1Digest should not be cloned to Md5Digest #2041

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
winfriedgerlach wants to merge 1 commit into from
Closed

fix: SHA1Digest should not be cloned to Md5Digest #2041

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 16 additions & 88 deletions core/src/main/java/org/bouncycastle/crypto/util/DigestFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
*/
public final class DigestFactory
{
private static final Map cloneMap = new HashMap();
private static final Map<String, Cloner> cloneMap = new HashMap<>();

private static interface Cloner
{
Expand All @@ -29,92 +29,20 @@ private static interface Cloner

static
{
cloneMap.put(createMD5().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new MD5Digest((MD5Digest)original);
}
});
cloneMap.put(createSHA1().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new MD5Digest((MD5Digest)original);
}
});
cloneMap.put(createSHA224().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHA224Digest((SHA224Digest)original);
}
});
cloneMap.put(createSHA256().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return SHA256Digest.newInstance(original);
}
});
cloneMap.put(createSHA384().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHA384Digest((SHA384Digest)original);
}
});
cloneMap.put(createSHA512().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHA512Digest((SHA512Digest)original);
}
});
cloneMap.put(createSHA3_224().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHA3Digest((SHA3Digest)original);
}
});
cloneMap.put(createSHA3_256().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHA3Digest((SHA3Digest)original);
}
});
cloneMap.put(createSHA3_384().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHA3Digest((SHA3Digest)original);
}
});
cloneMap.put(createSHA3_512().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHA3Digest((SHA3Digest)original);
}
});

cloneMap.put(createSHAKE128().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHAKEDigest((SHAKEDigest)original);
}
});

cloneMap.put(createSHAKE256().getAlgorithmName(), new Cloner()
{
public Digest createClone(Digest original)
{
return new SHAKEDigest((SHAKEDigest)original);
}
});
cloneMap.put(createMD5().getAlgorithmName(), original -> new MD5Digest((MD5Digest)original));
cloneMap.put(createSHA1().getAlgorithmName(), original -> new SHA1Digest((SHA1Digest)original));
cloneMap.put(createSHA224().getAlgorithmName(), original -> new SHA224Digest((SHA224Digest)original));
cloneMap.put(createSHA256().getAlgorithmName(), SHA256Digest::newInstance);
cloneMap.put(createSHA384().getAlgorithmName(), original -> new SHA384Digest((SHA384Digest)original));
cloneMap.put(createSHA512().getAlgorithmName(), original -> new SHA512Digest((SHA512Digest)original));
cloneMap.put(createSHA3_224().getAlgorithmName(), original -> new SHA3Digest((SHA3Digest)original));
cloneMap.put(createSHA3_256().getAlgorithmName(), original -> new SHA3Digest((SHA3Digest)original));
cloneMap.put(createSHA3_384().getAlgorithmName(), original -> new SHA3Digest((SHA3Digest)original));
cloneMap.put(createSHA3_512().getAlgorithmName(), original -> new SHA3Digest((SHA3Digest)original));

cloneMap.put(createSHAKE128().getAlgorithmName(), original -> new SHAKEDigest((SHAKEDigest)original));

cloneMap.put(createSHAKE256().getAlgorithmName(), original -> new SHAKEDigest((SHAKEDigest)original));
}

public static Digest createMD5()
Expand Down Expand Up @@ -249,6 +177,6 @@ public static Digest createSHAKE256()

public static Digest cloneDigest(Digest hashAlg)
{
return ((Cloner)cloneMap.get(hashAlg.getAlgorithmName())).createClone(hashAlg);
return cloneMap.get(hashAlg.getAlgorithmName()).createClone(hashAlg);
}
}