mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-14 04:03:47 +00:00
Fix 160028: JSSKeyGeneratorSpi.HmacSHA1 should be renamed to PBAHmacSHA1.
This commit is contained in:
parent
297b98f113
commit
82f245ad70
@ -137,6 +137,8 @@ public final class JSSProvider extends java.security.Provider {
|
||||
"org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$RC4");
|
||||
put("KeyGenerator.HmacSHA1",
|
||||
"org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$HmacSHA1");
|
||||
put("KeyGenerator.PBAHmacSHA1",
|
||||
"org.mozilla.jss.provider.javax.crypto.JSSKeyGeneratorSpi$PBAHmacSHA1");
|
||||
|
||||
/////////////////////////////////////////////////////////////
|
||||
// SecretKeyFactory
|
||||
@ -152,6 +154,8 @@ public final class JSSProvider extends java.security.Provider {
|
||||
"org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$RC4");
|
||||
put("SecretKeyFactory.HmacSHA1",
|
||||
"org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$HmacSHA1");
|
||||
put("SecretKeyFactory.PBAHmacSHA1",
|
||||
"org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$PBAHmacSHA1");
|
||||
put("SecretKeyFactory.PBEWithMD5AndDES",
|
||||
"org.mozilla.jss.provider.javax.crypto.JSSSecretKeyFactorySpi$PBE_MD5_DES_CBC");
|
||||
put("SecretKeyFactory.PBEWithSHA1AndDES",
|
||||
|
@ -124,10 +124,22 @@ class JSSKeyGeneratorSpi extends javax.crypto.KeyGeneratorSpi {
|
||||
super(KeyGenAlgorithm.RC4);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This class name is misleading. This algorithm
|
||||
* is used for generating Password-Based Authentication keys
|
||||
* for use with HmacSHA1. Use PBAHmacSHA1 instead.
|
||||
*/
|
||||
public static class HmacSHA1 extends JSSKeyGeneratorSpi {
|
||||
public HmacSHA1() {
|
||||
super(KeyGenAlgorithm.PBA_SHA1_HMAC);
|
||||
}
|
||||
}
|
||||
|
||||
public static class PBAHmacSHA1 extends JSSKeyGeneratorSpi {
|
||||
public PBAHmacSHA1() {
|
||||
super(KeyGenAlgorithm.PBA_SHA1_HMAC);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
@ -405,10 +405,21 @@ class JSSSecretKeyFactorySpi extends SecretKeyFactorySpi {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @deprecated This class name is misleading. This algorithm
|
||||
* is used for generating Password-Based Authentication keys
|
||||
* for use with HmacSHA1. Use PBAHmacSHA1 instead.
|
||||
*/
|
||||
public static class HmacSHA1 extends JSSSecretKeyFactorySpi {
|
||||
public HmacSHA1() {
|
||||
super(KeyGenAlgorithm.PBA_SHA1_HMAC);
|
||||
}
|
||||
}
|
||||
|
||||
public static class PBAHmacSHA1 extends JSSSecretKeyFactorySpi {
|
||||
public PBAHmacSHA1() {
|
||||
super(KeyGenAlgorithm.PBA_SHA1_HMAC);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user