Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 23425 into eclair

Browse Source 
* changes:
  Store CA certificate chain into one single key entry with PEM format.
This commit is contained in:
Android (Google) Code Review
2009-09-01 23:23:41 -07:00
parent 9b6a8ab822 09960230bf
commit 9c64d59027
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
keystore/java/android/security/CertTool.java
View File

@@ -163,15 +163,9 @@ public class CertTool {
return ret;
}
}
while ((pemData = this.popPkcs12CertificateStack(handle)) != null) {
if (i++ > 0) {
if ((ret = sKeystore.put(CA_CERTIFICATE, keyname + i, pemData)) != 0) {
return ret;
}
} else {
if ((ret = sKeystore.put(CA_CERTIFICATE, keyname, pemData)) != 0) {
return ret;
}
if ((pemData = this.popPkcs12CertificateStack(handle)) != null) {
if ((ret = sKeystore.put(CA_CERTIFICATE, keyname, pemData)) != 0) {
return ret;
}
}
return 0;

22
keystore/jni/cert.c
View File

@@ -212,13 +212,14 @@ static int convert_to_pem(void *data, int is_cert, char *buf, int size)
}
err:
if (bio) BIO_free(bio);
return (len == 0) ? -1 : 0;
return len;
}
int get_pkcs12_certificate(PKCS12_KEYSTORE *p12store, char *buf, int size)
{
if ((p12store != NULL) && (p12store->cert != NULL)) {
return convert_to_pem((void*)p12store->cert, 1, buf, size);
int len = convert_to_pem((void*)p12store->cert, 1, buf, size);
return (len == 0) ? -1 : 0;
}
return -1;
}
@@ -226,7 +227,8 @@ int get_pkcs12_certificate(PKCS12_KEYSTORE *p12store, char *buf, int size)
int get_pkcs12_private_key(PKCS12_KEYSTORE *p12store, char *buf, int size)
{
if ((p12store != NULL) && (p12store->pkey != NULL)) {
return convert_to_pem((void*)p12store->pkey, 0, buf, size);
int len = convert_to_pem((void*)p12store->pkey, 0, buf, size);
return (len == 0) ? -1 : 0;
}
return -1;
}
@@ -234,12 +236,16 @@ int get_pkcs12_private_key(PKCS12_KEYSTORE *p12store, char *buf, int size)
int pop_pkcs12_certs_stack(PKCS12_KEYSTORE *p12store, char *buf, int size)
{
X509 *cert = NULL;
int len = 0;
if ((p12store != NULL) && (p12store->certs != NULL) &&
((cert = sk_X509_pop(p12store->certs)) != NULL)) {
int ret = convert_to_pem((void*)cert, 1, buf, size);
X509_free(cert);
return ret;
if ((p12store != NULL) && (p12store->certs != NULL)) {
while (((cert = sk_X509_pop(p12store->certs)) != NULL) && (len < size)) {
int s = convert_to_pem((void*)cert, 1, buf + len, size - len);
if (s == 0) return -1;
len += s;
X509_free(cert);
}
return (len == 0) ? -1 : 0;
}
return -1;
}