denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

android: Add support for signature schemes used by EAP-TLS

Browse Source
This commit is contained in:
Tobias Brunner
2014-11-06 16:28:40 +01:00
parent 0ef74bec98
commit 4b39a4117a
1 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontends/android/jni/libandroidbridge/backend/android_private_key.c
+16 -1
View File
@@ -68,6 +68,9 @@ METHOD(private_key_t, sign, bool,
case KEY_RSA: case KEY_RSA:
switch (scheme) switch (scheme)
{ {
case SIGN_RSA_EMSA_PKCS1_NULL:
method = "NONEwithRSA";
break;
case SIGN_RSA_EMSA_PKCS1_MD5: case SIGN_RSA_EMSA_PKCS1_MD5:
method = "MD5withRSA"; method = "MD5withRSA";
break; break;
@@ -93,12 +96,18 @@ METHOD(private_key_t, sign, bool,
case KEY_ECDSA: case KEY_ECDSA:
switch (scheme) switch (scheme)
{ {
case SIGN_ECDSA_WITH_SHA1_DER:
method = "SHA1withECDSA";
break;
case SIGN_ECDSA_WITH_SHA256_DER:
case SIGN_ECDSA_256: case SIGN_ECDSA_256:
method = "SHA256withECDSA"; method = "SHA256withECDSA";
break; break;
case SIGN_ECDSA_WITH_SHA384_DER:
case SIGN_ECDSA_384: case SIGN_ECDSA_384:
method = "SHA384withECDSA"; method = "SHA384withECDSA";
break; break;
case SIGN_ECDSA_WITH_SHA512_DER:
case SIGN_ECDSA_521: case SIGN_ECDSA_521:
method = "SHA512withECDSA"; method = "SHA512withECDSA";
break; break;
@@ -189,7 +198,8 @@ METHOD(private_key_t, sign, bool,
default: default:
break; break;
} }
if (len)
{
/* we get an ASN.1 encoded sequence of integers r and s */ /* we get an ASN.1 encoded sequence of integers r and s */
parse = encoded = chunk_from_byte_array(env, jsigarray); parse = encoded = chunk_from_byte_array(env, jsigarray);
if (asn1_unwrap(&parse, &parse) != ASN1_SEQUENCE || if (asn1_unwrap(&parse, &parse) != ASN1_SEQUENCE ||
@@ -218,6 +228,11 @@ METHOD(private_key_t, sign, bool,
{ {
*signature = chunk_from_byte_array(env, jsigarray); *signature = chunk_from_byte_array(env, jsigarray);
} }
}
else
{
*signature = chunk_from_byte_array(env, jsigarray);
}
androidjni_detach_thread(); androidjni_detach_thread();
return TRUE; return TRUE;