Remove scrypt-related code
This is no longer used.
Bug: 191796797
Change-Id: I05bc4dc9c25c050ace49606981c4f4db3d76f401
diff --git a/Android.bp b/Android.bp
index 35f74bf..2b2d91c 100644
--- a/Android.bp
+++ b/Android.bp
@@ -41,7 +41,6 @@
"libfec_rs",
"libfs_avb",
"libfs_mgr",
- "libscrypt_static",
"libsquashfs_utils",
"libvold_binder",
],
@@ -130,7 +129,6 @@
"NetlinkHandler.cpp",
"NetlinkManager.cpp",
"Process.cpp",
- "ScryptParameters.cpp",
"Utils.cpp",
"VoldNativeService.cpp",
"VoldNativeServiceValidation.cpp",
diff --git a/KeyStorage.cpp b/KeyStorage.cpp
index 4b39aef..007ce66 100644
--- a/KeyStorage.cpp
+++ b/KeyStorage.cpp
@@ -18,7 +18,6 @@
#include "Checkpoint.h"
#include "Keystore.h"
-#include "ScryptParameters.h"
#include "Utils.h"
#include <algorithm>
@@ -45,11 +44,6 @@
#include <cutils/properties.h>
-extern "C" {
-
-#include "crypto_scrypt.h"
-}
-
namespace android {
namespace vold {
diff --git a/ScryptParameters.cpp b/ScryptParameters.cpp
deleted file mode 100644
index f5a964f..0000000
--- a/ScryptParameters.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2016 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 "ScryptParameters.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-bool parse_scrypt_parameters(const char* paramstr, int* Nf, int* rf, int* pf) {
- int params[3] = {};
- char* token;
- char* saveptr;
- int i;
-
- /*
- * The token we're looking for should be three integers separated by
- * colons (e.g., "12:8:1"). Scan the property to make sure it matches.
- */
- for (i = 0, token = strtok_r(const_cast<char*>(paramstr), ":", &saveptr);
- token != nullptr && i < 3; i++, token = strtok_r(nullptr, ":", &saveptr)) {
- char* endptr;
- params[i] = strtol(token, &endptr, 10);
-
- /*
- * Check that there was a valid number and it's 8-bit.
- */
- if ((*token == '\0') || (*endptr != '\0') || params[i] < 0 || params[i] > 255) {
- return false;
- }
- }
- if (token != nullptr) {
- return false;
- }
- *Nf = params[0];
- *rf = params[1];
- *pf = params[2];
- return true;
-}
diff --git a/ScryptParameters.h b/ScryptParameters.h
deleted file mode 100644
index edb80cc..0000000
--- a/ScryptParameters.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2016 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.
- */
-
-#ifndef ANDROID_VOLD_SCRYPT_PARAMETERS_H
-#define ANDROID_VOLD_SCRYPT_PARAMETERS_H
-
-#include <stdbool.h>
-#include <sys/cdefs.h>
-
-#define SCRYPT_PROP "ro.crypto.scrypt_params"
-#define SCRYPT_DEFAULTS "15:3:1"
-
-bool parse_scrypt_parameters(const char* paramstr, int* Nf, int* rf, int* pf);
-
-#endif