ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Switch from using base64 BIOs to encoding funcs."

Browse source
This commit is contained in:
Alex Klyubin 2014-09-26 21:51:35 +00:00 • committed by Gerrit Code Review
commit e3d3016d46
1 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
adb/adb_auth_host.c
View file

@ -45,6 +45,10 @@
#include <openssl/rsa.h> #include <openssl/rsa.h>
#include <openssl/sha.h> #include <openssl/sha.h>
#if defined(OPENSSL_IS_BORINGSSL)
#include <openssl/base64.h>
#endif
#define TRACE_TAG TRACE_AUTH #define TRACE_TAG TRACE_AUTH
#define ANDROID_PATH ".android" #define ANDROID_PATH ".android"
@ -132,43 +136,67 @@ static void get_user_info(char *buf, size_t len)
static int write_public_keyfile(RSA *private_key, const char *private_key_path) static int write_public_keyfile(RSA *private_key, const char *private_key_path)
{ {
RSAPublicKey pkey; RSAPublicKey pkey;
BIO *bio, *b64, *bfile; FILE *outfile = NULL;
char path[PATH_MAX], info[MAX_PAYLOAD]; char path[PATH_MAX], info[MAX_PAYLOAD];
int ret; uint8_t *encoded = NULL;
size_t encoded_length;
int ret = 0;
ret = snprintf(path, sizeof(path), "%s.pub", private_key_path); if (snprintf(path, sizeof(path), "%s.pub", private_key_path) >=
if (ret >= (signed)sizeof(path)) (int)sizeof(path)) {
D("Path too long while writing public key\n");
return 0; return 0;
}
ret = RSA_to_RSAPublicKey(private_key, &pkey); if (!RSA_to_RSAPublicKey(private_key, &pkey)) {
if (!ret) {
D("Failed to convert to publickey\n"); D("Failed to convert to publickey\n");
return 0; return 0;
} }
bfile = BIO_new_file(path, "w"); outfile = fopen(path, "w");
if (!bfile) { if (!outfile) {
D("Failed to open '%s'\n", path); D("Failed to open '%s'\n", path);
return 0; return 0;
} }
D("Writing public key to '%s'\n", path); D("Writing public key to '%s'\n", path);
b64 = BIO_new(BIO_f_base64()); #if defined(OPENSSL_IS_BORINGSSL)
BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL); if (!EVP_EncodedLength(&encoded_length, sizeof(pkey))) {
D("Public key too large to base64 encode");
goto out;
}
#else
/* While we switch from OpenSSL to BoringSSL we have to implement
* |EVP_EncodedLength| here. */
encoded_length = 1 + ((sizeof(pkey) + 2) / 3 * 4);
#endif
bio = BIO_push(b64, bfile); encoded = malloc(encoded_length);
BIO_write(bio, &pkey, sizeof(pkey)); if (encoded == NULL) {
(void) BIO_flush(bio); D("Allocation failure");
BIO_pop(b64); goto out;
BIO_free(b64); }
encoded_length = EVP_EncodeBlock(encoded, (uint8_t*) &pkey, sizeof(pkey));
get_user_info(info, sizeof(info)); get_user_info(info, sizeof(info));
BIO_write(bfile, info, strlen(info));
(void) BIO_flush(bfile);
BIO_free_all(bfile);
return 1; if (fwrite(encoded, encoded_length, 1, outfile) != 1 ||
fwrite(info, strlen(info), 1, outfile) != 1) {
D("Write error while writing public key");
goto out;
}
ret = 1;
out:
if (outfile != NULL) {
fclose(outfile);
}
if (encoded != NULL) {
free(encoded);
}
return ret;
} }
static int generate_key(const char *file) static int generate_key(const char *file)