aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSpiritCroc <dev@spiritcroc.de>2019-09-13 16:40:55 +0200
committerSpiritCroc <dev@spiritcroc.de>2019-09-13 16:42:31 +0200
commitb3a8452c12bcdacb4f7aeacd1f248f9c1b5d3ffb (patch)
tree39231ddf68cfcfb7473917b7576debb7adf7e0c4
parent400adb1cd85a792005cf1a7246a7be2bb6e886b3 (diff)
Remove rsa_pssHEADq10.0
Fix compile on Android 10.0 external/sony/boringssl-compat/rsa_pss.c:19:5: error: conflicting types for 'RSA_verify_PKCS1_PSS' int RSA_verify_PKCS1_PSS(RSA *rsa, ^ Change-Id: If4e7933d12f1bd55ae6a104cc0be7f99fb009bdd
-rw-r--r--Android.mk4
-rw-r--r--rsa_pss.c26
2 files changed, 1 insertions, 29 deletions
diff --git a/Android.mk b/Android.mk
index 5a97534..ec4edac 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,11 +24,9 @@ EVP_FILES := \
LOCAL_CFLAGS += -Wno-error
-RSA_FILES := rsa_pss.c
-
B64_FILES := bio_b64.c
-LOCAL_SRC_FILES := $(EVP_FILES) $(RSA_FILES)
+LOCAL_SRC_FILES := $(EVP_FILES)
ifeq ($(TARGET_REQUIRES_B64_COMPAT),true)
LOCAL_SRC_FILES += $(B64_FILES)
diff --git a/rsa_pss.c b/rsa_pss.c
deleted file mode 100644
index 5b1ccbe..0000000
--- a/rsa_pss.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2015 Sony Mobile Communications AB
- *
- * 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 <openssl/rsa.h>
-
-int RSA_verify_PKCS1_PSS(RSA *rsa,
- const unsigned char *mHash,
- const EVP_MD *Hash,
- const unsigned char *EM,
- int sLen)
-{
- return RSA_verify_PKCS1_PSS_mgf1(rsa, mHash, Hash, NULL, EM, sLen);
-}