summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2013-09-12 22:43:32 -0700
committerKenny Root <kroot@google.com>2013-09-12 22:43:34 -0700
commit07ff5de463a219d97b5ea7abfaa42bf3ae55fb57 (patch)
tree2a8826425554cd732984ca5d92064c2228cb9267 /crypto
parent0808990344e30965a35d36b0a54916482049e532 (diff)
downloadlibcore-07ff5de463a219d97b5ea7abfaa42bf3ae55fb57.zip
libcore-07ff5de463a219d97b5ea7abfaa42bf3ae55fb57.tar.gz
libcore-07ff5de463a219d97b5ea7abfaa42bf3ae55fb57.tar.bz2
Restore NativeCrypto#encodeCertificates for now
Some other classes are using this. Restore this until they can be removed. Change-Id: Ibf188b7c4915865e20cc4ca51c73f26314df7828
Diffstat (limited to 'crypto')
-rw-r--r--crypto/src/main/java/org/conscrypt/NativeCrypto.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/crypto/src/main/java/org/conscrypt/NativeCrypto.java b/crypto/src/main/java/org/conscrypt/NativeCrypto.java
index 0c1d9fe..79871df 100644
--- a/crypto/src/main/java/org/conscrypt/NativeCrypto.java
+++ b/crypto/src/main/java/org/conscrypt/NativeCrypto.java
@@ -775,6 +775,15 @@ public final class NativeCrypto {
public static native void SSL_set1_tls_channel_id(long ssl, long pkey);
+ public static byte[][] encodeCertificates(Certificate[] certificates)
+ throws CertificateEncodingException {
+ byte[][] certificateBytes = new byte[certificates.length][];
+ for (int i = 0; i < certificates.length; i++) {
+ certificateBytes[i] = certificates[i].getEncoded();
+ }
+ return certificateBytes;
+ }
+
public static native void SSL_use_certificate(long ssl, long[] x509refs);
public static native void SSL_use_PrivateKey(long ssl, long pkey);