drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am cdc457bb: Merge "Tracking change to add AEAD functionality"

Browse Source 
* commit 'cdc457bbba0afae2f0bc1b1df7ba596da3a48676':
  Tracking change to add AEAD functionality
This commit is contained in:
Kenny Root
2013-05-14 18:29:22 -07:00
committed by Android Git Automerger
parent 08405ee6ad cdc457bbba
commit f35b35df6e
1 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
api/current.txt
View File

@ -42527,6 +42527,11 @@ package java.util.zip {
package javax.crypto { package javax.crypto {
public class AEADBadTagException extends javax.crypto.BadPaddingException {
ctor public AEADBadTagException();
ctor public AEADBadTagException(java.lang.String);
}
public class BadPaddingException extends java.security.GeneralSecurityException { public class BadPaddingException extends java.security.GeneralSecurityException {
ctor public BadPaddingException(java.lang.String); ctor public BadPaddingException(java.lang.String);
ctor public BadPaddingException(); ctor public BadPaddingException();
@ -42567,6 +42572,9 @@ package javax.crypto {
method public final int update(byte[], int, int, byte[]) throws javax.crypto.ShortBufferException; method public final int update(byte[], int, int, byte[]) throws javax.crypto.ShortBufferException;
method public final int update(byte[], int, int, byte[], int) throws javax.crypto.ShortBufferException; method public final int update(byte[], int, int, byte[], int) throws javax.crypto.ShortBufferException;
method public final int update(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.ShortBufferException; method public final int update(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.ShortBufferException;
method public final void updateAAD(byte[]);
method public final void updateAAD(byte[], int, int);
method public final void updateAAD(java.nio.ByteBuffer);
method public final byte[] wrap(java.security.Key) throws javax.crypto.IllegalBlockSizeException, java.security.InvalidKeyException; method public final byte[] wrap(java.security.Key) throws javax.crypto.IllegalBlockSizeException, java.security.InvalidKeyException;
field public static final int DECRYPT_MODE = 2; // 0x2 field public static final int DECRYPT_MODE = 2; // 0x2
field public static final int ENCRYPT_MODE = 1; // 0x1 field public static final int ENCRYPT_MODE = 1; // 0x1
@ -42606,6 +42614,8 @@ package javax.crypto {
method protected abstract byte[] engineUpdate(byte[], int, int); method protected abstract byte[] engineUpdate(byte[], int, int);
method protected abstract int engineUpdate(byte[], int, int, byte[], int) throws javax.crypto.ShortBufferException; method protected abstract int engineUpdate(byte[], int, int, byte[], int) throws javax.crypto.ShortBufferException;
method protected int engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.ShortBufferException; method protected int engineUpdate(java.nio.ByteBuffer, java.nio.ByteBuffer) throws javax.crypto.ShortBufferException;
method protected void engineUpdateAAD(byte[], int, int);
method protected void engineUpdateAAD(java.nio.ByteBuffer);
method protected byte[] engineWrap(java.security.Key) throws javax.crypto.IllegalBlockSizeException, java.security.InvalidKeyException; method protected byte[] engineWrap(java.security.Key) throws javax.crypto.IllegalBlockSizeException, java.security.InvalidKeyException;
} }
@ -42864,6 +42874,13 @@ package javax.crypto.spec {
method public java.math.BigInteger getY(); method public java.math.BigInteger getY();
} }
public class GCMParameterSpec implements java.security.spec.AlgorithmParameterSpec {
ctor public GCMParameterSpec(int, byte[]);
ctor public GCMParameterSpec(int, byte[], int, int);
method public byte[] getIV();
method public int getTLen();
}
public class IvParameterSpec implements java.security.spec.AlgorithmParameterSpec { public class IvParameterSpec implements java.security.spec.AlgorithmParameterSpec {
ctor public IvParameterSpec(byte[]); ctor public IvParameterSpec(byte[]);
ctor public IvParameterSpec(byte[], int, int); ctor public IvParameterSpec(byte[], int, int);