Merge "Drop configuration fuzzer" into main
diff --git a/fuzzer/Android.bp b/fuzzer/Android.bp
index 2fd54a7..3f265cd 100644
--- a/fuzzer/Android.bp
+++ b/fuzzer/Android.bp
@@ -72,13 +72,3 @@
"k4_AndroidKeymaster4Device_fuzzer.cpp",
],
}
-
-cc_fuzz {
- name: "k4_keymaster_configuration_fuzzer",
- defaults: [
- "libkeymaster4_fuzzer_defaults",
- ],
- srcs: [
- "k4_keymaster_configuration_fuzzer.cpp",
- ],
-}
diff --git a/fuzzer/README.md b/fuzzer/README.md
index 04f972c..c4aa233 100644
--- a/fuzzer/README.md
+++ b/fuzzer/README.md
@@ -33,7 +33,7 @@
## Build
-This describes steps to build k4_AndroidKeymaster4Device_fuzzer and k4_keymaster_configuration_fuzzer binaries
+This describes steps to build k4_AndroidKeymaster4Device_fuzzer binary
### Android
@@ -41,14 +41,12 @@
Build the fuzzer
```
$ mm k4_AndroidKeymaster4Device_fuzzer
- $ mm k4_keymaster_configuration_fuzzer
```
#### Steps to run
To run on device
```
$ adb sync data
$ adb shell /data/fuzz/${TARGET_ARCH}/k4_AndroidKeymaster4Device_fuzzer/k4_AndroidKeymaster4Device_fuzzer
- $ adb shell /data/fuzz/${TARGET_ARCH}/k4_keymaster_configuration_fuzzer/k4_keymaster_configuration_fuzzer
```
## References:
diff --git a/fuzzer/k4_keymaster_configuration_fuzzer.cpp b/fuzzer/k4_keymaster_configuration_fuzzer.cpp
deleted file mode 100644
index 06403bb..0000000
--- a/fuzzer/k4_keymaster_configuration_fuzzer.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2021 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 <fuzzer/FuzzedDataProvider.h>
-#include <keymaster/keymaster_configuration.h>
-
-constexpr size_t kMaxCharacters = 100;
-
-extern "C" int LLVMFuzzerTestOneInput(const uint8_t* data, size_t size) {
- FuzzedDataProvider fdp(data, size);
- keymaster::GetOsVersion(fdp.ConsumeRandomLengthString(kMaxCharacters).c_str());
- keymaster::GetOsPatchlevel(fdp.ConsumeRandomLengthString(kMaxCharacters).c_str());
-
- return 0;
-}
