Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)

Bug: 166295507
Merged-In: I628ec62d77696454d347eed3cb10e510529ee3ee
Change-Id: I1ff80cc4bdf486f9d54c59b034fcfdd8ee5513a0

2 files changed, 82 insertions, 0 deletions

diff --git a/fuzzing/system_fuzzers/libcrypto_utils/Android.bp b/fuzzing/system_fuzzers/libcrypto_utils/Android.bp
new file mode 100644
index 0000000..4214b35
--- /dev/null
+++ b/fuzzing/system_fuzzers/libcrypto_utils/Android.bp
@@ -0,0 +1,17 @@
+cc_fuzz {
+    host_supported: true,
+    name : "libcrypto_utils_fuzzer",
+    srcs: [
+        "libcrypto_utils_fuzzer.cpp",
+    ],
+    cflags: [
+        "-Wall",
+        "-Werror",
+        "-Wextra",
+    ],
+    shared_libs: [
+        "libcrypto_utils",
+        "libcrypto",
+    ],
+}
+
diff --git a/fuzzing/system_fuzzers/libcrypto_utils/libcrypto_utils_fuzzer.cpp b/fuzzing/system_fuzzers/libcrypto_utils/libcrypto_utils_fuzzer.cpp
new file mode 100644
index 0000000..b14086d
--- /dev/null
+++ b/fuzzing/system_fuzzers/libcrypto_utils/libcrypto_utils_fuzzer.cpp
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <crypto_utils/android_pubkey.h>
+#include <fuzzer/FuzzedDataProvider.h>
+#include <string.h>
+#include <memory>
+#include <openssl/obj_mac.h>
+#include <openssl/rsa.h>
+#include <cstdio>
+
+#define ANDROID_PUBKEY_MODULUS_SIZE_WORDS (ANDROID_PUBKEY_MODULUS_SIZE / 4)
+
+extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, std::size_t size) {
+    if (size < 2050) {
+        return 0;
+    }
+
+    FuzzedDataProvider fdp(data, size);
+
+    uint8_t buffer[ANDROID_PUBKEY_ENCODED_SIZE];
+    uint32_t modulus_size_words = ANDROID_PUBKEY_MODULUS_SIZE_WORDS;
+    memcpy(buffer, &modulus_size_words, sizeof(uint32_t));
+
+    uint32_t n0inv = fdp.ConsumeIntegralInRange<uint32_t>(0,2^32);
+    memcpy(buffer+sizeof(uint32_t), &n0inv, sizeof(uint32_t));
+
+    std::string s = fdp.ConsumeBytesAsString(ANDROID_PUBKEY_MODULUS_SIZE);
+    uint8_t* modulus = (uint8_t*)s.c_str();
+    memcpy(buffer+sizeof(uint32_t)*2, modulus,
+           sizeof(uint8_t)*ANDROID_PUBKEY_MODULUS_SIZE);
+
+    std::string ss = fdp.ConsumeBytesAsString(ANDROID_PUBKEY_MODULUS_SIZE);
+    uint8_t* rr = (uint8_t*)ss.c_str();
+    memcpy(buffer+sizeof(uint32_t)*2+ANDROID_PUBKEY_MODULUS_SIZE, rr,
+           sizeof(uint8_t)*ANDROID_PUBKEY_MODULUS_SIZE);
+
+    int flip = fdp.ConsumeIntegralInRange<uint32_t>(0,1);
+    buffer[ANDROID_PUBKEY_ENCODED_SIZE-1] = (uint8_t)(flip == 0 ? 3 : 65537);
+
+    RSA* new_key = nullptr;
+    android_pubkey_decode(buffer, sizeof(uint8_t)*ANDROID_PUBKEY_ENCODED_SIZE, &new_key);
+
+    uint8_t key_data[ANDROID_PUBKEY_ENCODED_SIZE];
+    android_pubkey_encode(new_key, key_data, sizeof(key_data));
+
+    assert(0 == memcmp(buffer, key_data, sizeof(buffer)));
+
+    RSA_free(new_key);
+
+    return 0;
+}