diff options
| author | Sergio Giro <sgiro@google.com> | 2017-01-19 21:40:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-01-19 21:40:17 +0000 |
| commit | fbf7512c8942075f80cba53e708c13682f04ea29 (patch) | |
| tree | 8ebc72ead6f9a80938fdba92e217da96ee451037 /bcprov/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java | |
| parent | e54ca62fe13a7f6a52a89e409edcf4b6547072be (diff) | |
| parent | 07a37e800ceaa1470036078af8d69981604e0945 (diff) | |
| download | bouncycastle-fbf7512c8942075f80cba53e708c13682f04ea29.tar.gz | |
Merge "bouncycastle: upgrade to version 1.56" am: ae9dc88d85 am: ed012da722
am: 07a37e800c
Change-Id: Ie6a51b57d83037f0f7f1acecedc16da1c1bd6820
Diffstat (limited to 'bcprov/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java')
| -rw-r--r-- | bcprov/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java index 1d8f582c..63fa2e4e 100644 --- a/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java +++ b/bcprov/src/main/java/org/bouncycastle/asn1/pkcs/MacData.java @@ -11,6 +11,7 @@ import org.bouncycastle.asn1.ASN1Sequence; import org.bouncycastle.asn1.DEROctetString; import org.bouncycastle.asn1.DERSequence; import org.bouncycastle.asn1.x509.DigestInfo; +import org.bouncycastle.util.Arrays; public class MacData extends ASN1Object @@ -41,7 +42,7 @@ public class MacData { this.digInfo = DigestInfo.getInstance(seq.getObjectAt(0)); - this.salt = ((ASN1OctetString)seq.getObjectAt(1)).getOctets(); + this.salt = Arrays.clone(((ASN1OctetString)seq.getObjectAt(1)).getOctets()); if (seq.size() == 3) { @@ -59,7 +60,7 @@ public class MacData int iterationCount) { this.digInfo = digInfo; - this.salt = salt; + this.salt = Arrays.clone(salt); this.iterationCount = BigInteger.valueOf(iterationCount); } @@ -70,7 +71,7 @@ public class MacData public byte[] getSalt() { - return salt; + return Arrays.clone(salt); } public BigInteger getIterationCount() |