From 6b029454ccd8c09b9fad19ac5c511977ff86a837 Mon Sep 17 00:00:00 2001 From: Pushkar Kulkarni Date: Thu, 12 Dec 2024 00:05:06 +0530 Subject: [PATCH] Rename JNI related files --- ...canonical_openssl_cipher_OpenSSLCipher.c => OpenSSLCipher.c} | 2 +- .../{com_canonical_openssl_drbg_OpenSSLDrbg.c => OpenSSLDrbg.c} | 2 +- ...keyagreement_OpenSSLKeyAgreement.c => OpenSSLKeyAgreement.c} | 2 +- .../c/{com_canonical_openssl_mac_OpenSSLMAC.c => OpenSSLMAC.c} | 2 +- .../c/{com_canonical_openssl_md_OpenSSLMD.c => OpenSSLMD.c} | 2 +- ...om_canonical_openssl_kdf_OpenSSLPBKDF2.c => OpenSSLPBKDF2.c} | 2 +- ..._openssl_signature_OpenSSLSignature.c => OpenSSLSignature.c} | 2 +- ..._OpenSSLKEMRSA_RSAKEMDecapsulator.c => RSAKEMDecapsulator.c} | 2 +- ..._OpenSSLKEMRSA_RSAKEMEncapsulator.c => RSAKEMEncapsulator.c} | 2 +- ...canonical_openssl_cipher_OpenSSLCipher.h => OpenSSLCipher.h} | 0 .../{com_canonical_openssl_drbg_OpenSSLDrbg.h => OpenSSLDrbg.h} | 0 ...keyagreement_OpenSSLKeyAgreement.h => OpenSSLKeyAgreement.h} | 0 .../{com_canonical_openssl_mac_OpenSSLMAC.h => OpenSSLMAC.h} | 0 .../jni/{com_canonical_openssl_md_OpenSSLMD.h => OpenSSLMD.h} | 0 ...om_canonical_openssl_kdf_OpenSSLPBKDF2.h => OpenSSLPBKDF2.h} | 0 ..._openssl_signature_OpenSSLSignature.h => OpenSSLSignature.h} | 0 ..._OpenSSLKEMRSA_RSAKEMDecapsulator.h => RSAKEMDecapsulator.h} | 0 ..._OpenSSLKEMRSA_RSAKEMEncapsulator.h => RSAKEMEncapsulator.h} | 0 18 files changed, 9 insertions(+), 9 deletions(-) rename src/main/native/c/{com_canonical_openssl_cipher_OpenSSLCipher.c => OpenSSLCipher.c} (98%) rename src/main/native/c/{com_canonical_openssl_drbg_OpenSSLDrbg.c => OpenSSLDrbg.c} (99%) rename src/main/native/c/{com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.c => OpenSSLKeyAgreement.c} (97%) rename src/main/native/c/{com_canonical_openssl_mac_OpenSSLMAC.c => OpenSSLMAC.c} (98%) rename src/main/native/c/{com_canonical_openssl_md_OpenSSLMD.c => OpenSSLMD.c} (97%) rename src/main/native/c/{com_canonical_openssl_kdf_OpenSSLPBKDF2.c => OpenSSLPBKDF2.c} (97%) rename src/main/native/c/{com_canonical_openssl_signature_OpenSSLSignature.c => OpenSSLSignature.c} (98%) rename src/main/native/c/{com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.c => RSAKEMDecapsulator.c} (97%) rename src/main/native/c/{com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.c => RSAKEMEncapsulator.c} (97%) rename src/main/native/include/jni/{com_canonical_openssl_cipher_OpenSSLCipher.h => OpenSSLCipher.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_drbg_OpenSSLDrbg.h => OpenSSLDrbg.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.h => OpenSSLKeyAgreement.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_mac_OpenSSLMAC.h => OpenSSLMAC.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_md_OpenSSLMD.h => OpenSSLMD.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_kdf_OpenSSLPBKDF2.h => OpenSSLPBKDF2.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_signature_OpenSSLSignature.h => OpenSSLSignature.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.h => RSAKEMDecapsulator.h} (100%) rename src/main/native/include/jni/{com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.h => RSAKEMEncapsulator.h} (100%) diff --git a/src/main/native/c/com_canonical_openssl_cipher_OpenSSLCipher.c b/src/main/native/c/OpenSSLCipher.c similarity index 98% rename from src/main/native/c/com_canonical_openssl_cipher_OpenSSLCipher.c rename to src/main/native/c/OpenSSLCipher.c index 12c130c..8399b6c 100644 --- a/src/main/native/c/com_canonical_openssl_cipher_OpenSSLCipher.c +++ b/src/main/native/c/OpenSSLCipher.c @@ -17,7 +17,7 @@ #include #include "jssl.h" #include "cipher.h" -#include "com_canonical_openssl_cipher_OpenSSLCipher.h" +#include "OpenSSLCipher.h" #define LARGE_SIZE 1024 extern OSSL_LIB_CTX *global_libctx; diff --git a/src/main/native/c/com_canonical_openssl_drbg_OpenSSLDrbg.c b/src/main/native/c/OpenSSLDrbg.c similarity index 99% rename from src/main/native/c/com_canonical_openssl_drbg_OpenSSLDrbg.c rename to src/main/native/c/OpenSSLDrbg.c index b39d019..fad5121 100644 --- a/src/main/native/c/com_canonical_openssl_drbg_OpenSSLDrbg.c +++ b/src/main/native/c/OpenSSLDrbg.c @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -#include "com_canonical_openssl_drbg_OpenSSLDrbg.h" +#include "OpenSSLDrbg.h" #include "drbg.h" /* TODOs diff --git a/src/main/native/c/com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.c b/src/main/native/c/OpenSSLKeyAgreement.c similarity index 97% rename from src/main/native/c/com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.c rename to src/main/native/c/OpenSSLKeyAgreement.c index 95deaf3..eb14502 100644 --- a/src/main/native/c/com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.c +++ b/src/main/native/c/OpenSSLKeyAgreement.c @@ -17,7 +17,7 @@ #include #include "jssl.h" #include "keyagreement.h" -#include "com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.h" +#include "OpenSSLKeyAgreement.h" #include "evp_utils.h" #include "jni_utils.h" diff --git a/src/main/native/c/com_canonical_openssl_mac_OpenSSLMAC.c b/src/main/native/c/OpenSSLMAC.c similarity index 98% rename from src/main/native/c/com_canonical_openssl_mac_OpenSSLMAC.c rename to src/main/native/c/OpenSSLMAC.c index acea3e0..ab1d618 100644 --- a/src/main/native/c/com_canonical_openssl_mac_OpenSSLMAC.c +++ b/src/main/native/c/OpenSSLMAC.c @@ -16,7 +16,7 @@ */ #include "jssl.h" #include "mac.h" -#include "com_canonical_openssl_mac_OpenSSLMAC.h" +#include "OpenSSLMAC.h" #include "jni_utils.h" #define MAX_OUTPUT_LEN 512 diff --git a/src/main/native/c/com_canonical_openssl_md_OpenSSLMD.c b/src/main/native/c/OpenSSLMD.c similarity index 97% rename from src/main/native/c/com_canonical_openssl_md_OpenSSLMD.c rename to src/main/native/c/OpenSSLMD.c index 7aaf359..5a661ae 100644 --- a/src/main/native/c/com_canonical_openssl_md_OpenSSLMD.c +++ b/src/main/native/c/OpenSSLMD.c @@ -14,7 +14,7 @@ * along with this program. If not, see . * */ -#include "com_canonical_openssl_md_OpenSSLMD.h" +#include "OpenSSLMD.h" #include "jssl.h" #include "md.h" #include "jni_utils.h" diff --git a/src/main/native/c/com_canonical_openssl_kdf_OpenSSLPBKDF2.c b/src/main/native/c/OpenSSLPBKDF2.c similarity index 97% rename from src/main/native/c/com_canonical_openssl_kdf_OpenSSLPBKDF2.c rename to src/main/native/c/OpenSSLPBKDF2.c index 913a994..7e7bd30 100644 --- a/src/main/native/c/com_canonical_openssl_kdf_OpenSSLPBKDF2.c +++ b/src/main/native/c/OpenSSLPBKDF2.c @@ -16,7 +16,7 @@ */ #include "jni_utils.h" #include "kdf.h" -#include "com_canonical_openssl_kdf_OpenSSLPBKDF2.h" +#include "OpenSSLPBKDF2.h" #define MAX_KEY_SIZE 64 extern OSSL_LIB_CTX *global_libctx; diff --git a/src/main/native/c/com_canonical_openssl_signature_OpenSSLSignature.c b/src/main/native/c/OpenSSLSignature.c similarity index 98% rename from src/main/native/c/com_canonical_openssl_signature_OpenSSLSignature.c rename to src/main/native/c/OpenSSLSignature.c index dd8aba6..059af7e 100644 --- a/src/main/native/c/com_canonical_openssl_signature_OpenSSLSignature.c +++ b/src/main/native/c/OpenSSLSignature.c @@ -15,7 +15,7 @@ * */ #include "jssl.h" -#include "com_canonical_openssl_signature_OpenSSLSignature.h" +#include "OpenSSLSignature.h" #include "signature.h" #include "evp_utils.h" #include "jni_utils.h" diff --git a/src/main/native/c/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.c b/src/main/native/c/RSAKEMDecapsulator.c similarity index 97% rename from src/main/native/c/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.c rename to src/main/native/c/RSAKEMDecapsulator.c index 59a05f2..24daafb 100644 --- a/src/main/native/c/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.c +++ b/src/main/native/c/RSAKEMDecapsulator.c @@ -17,7 +17,7 @@ #include #include "jssl.h" #include "keyencapsulation.h" -#include "com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.h" +#include "RSAKEMDecapsulator.h" #include "evp_utils.h" #include "jni_utils.h" diff --git a/src/main/native/c/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.c b/src/main/native/c/RSAKEMEncapsulator.c similarity index 97% rename from src/main/native/c/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.c rename to src/main/native/c/RSAKEMEncapsulator.c index ef92ac0..2b46f21 100644 --- a/src/main/native/c/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.c +++ b/src/main/native/c/RSAKEMEncapsulator.c @@ -17,7 +17,7 @@ #include #include "jssl.h" #include "keyencapsulation.h" -#include "com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.h" +#include "RSAKEMEncapsulator.h" #include "evp_utils.h" #include "jni_utils.h" diff --git a/src/main/native/include/jni/com_canonical_openssl_cipher_OpenSSLCipher.h b/src/main/native/include/jni/OpenSSLCipher.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_cipher_OpenSSLCipher.h rename to src/main/native/include/jni/OpenSSLCipher.h diff --git a/src/main/native/include/jni/com_canonical_openssl_drbg_OpenSSLDrbg.h b/src/main/native/include/jni/OpenSSLDrbg.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_drbg_OpenSSLDrbg.h rename to src/main/native/include/jni/OpenSSLDrbg.h diff --git a/src/main/native/include/jni/com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.h b/src/main/native/include/jni/OpenSSLKeyAgreement.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_keyagreement_OpenSSLKeyAgreement.h rename to src/main/native/include/jni/OpenSSLKeyAgreement.h diff --git a/src/main/native/include/jni/com_canonical_openssl_mac_OpenSSLMAC.h b/src/main/native/include/jni/OpenSSLMAC.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_mac_OpenSSLMAC.h rename to src/main/native/include/jni/OpenSSLMAC.h diff --git a/src/main/native/include/jni/com_canonical_openssl_md_OpenSSLMD.h b/src/main/native/include/jni/OpenSSLMD.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_md_OpenSSLMD.h rename to src/main/native/include/jni/OpenSSLMD.h diff --git a/src/main/native/include/jni/com_canonical_openssl_kdf_OpenSSLPBKDF2.h b/src/main/native/include/jni/OpenSSLPBKDF2.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_kdf_OpenSSLPBKDF2.h rename to src/main/native/include/jni/OpenSSLPBKDF2.h diff --git a/src/main/native/include/jni/com_canonical_openssl_signature_OpenSSLSignature.h b/src/main/native/include/jni/OpenSSLSignature.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_signature_OpenSSLSignature.h rename to src/main/native/include/jni/OpenSSLSignature.h diff --git a/src/main/native/include/jni/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.h b/src/main/native/include/jni/RSAKEMDecapsulator.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMDecapsulator.h rename to src/main/native/include/jni/RSAKEMDecapsulator.h diff --git a/src/main/native/include/jni/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.h b/src/main/native/include/jni/RSAKEMEncapsulator.h similarity index 100% rename from src/main/native/include/jni/com_canonical_openssl_keyencapsulation_OpenSSLKEMRSA_RSAKEMEncapsulator.h rename to src/main/native/include/jni/RSAKEMEncapsulator.h