Merge pull request #55 from canonical/file-renaming

Rename JNI related files
canonical · Dec 11, 2024 · 1b27b5b · 1b27b5b
2 parents ecf169e + 6b02945
commit 1b27b5b
Show file tree

Hide file tree

Showing 18 changed files with 9 additions and 9 deletions.
diff --git a/..._canonical_openssl_cipher_OpenSSLCipher.c → src/main/native/c/OpenSSLCipher.c b/..._canonical_openssl_cipher_OpenSSLCipher.c → src/main/native/c/OpenSSLCipher.c
@@ -17,7 +17,7 @@
 #include <jni.h>
 #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/.../com_canonical_openssl_drbg_OpenSSLDrbg.c → src/main/native/c/OpenSSLDrbg.c b/.../com_canonical_openssl_drbg_OpenSSLDrbg.c → src/main/native/c/OpenSSLDrbg.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "com_canonical_openssl_drbg_OpenSSLDrbg.h"
+#include "OpenSSLDrbg.h"
 #include "drbg.h"
 
 /* TODOs

diff --git a/...penssl_keyagreement_OpenSSLKeyAgreement.c → src/main/native/c/OpenSSLKeyAgreement.c b/...penssl_keyagreement_OpenSSLKeyAgreement.c → src/main/native/c/OpenSSLKeyAgreement.c
@@ -17,7 +17,7 @@
 #include <jni.h>
 #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/.../c/com_canonical_openssl_mac_OpenSSLMAC.c → src/main/native/c/OpenSSLMAC.c b/.../c/com_canonical_openssl_mac_OpenSSLMAC.c → 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/...ve/c/com_canonical_openssl_md_OpenSSLMD.c → src/main/native/c/OpenSSLMD.c b/...ve/c/com_canonical_openssl_md_OpenSSLMD.c → src/main/native/c/OpenSSLMD.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-#include "com_canonical_openssl_md_OpenSSLMD.h"
+#include "OpenSSLMD.h"
 #include "jssl.h"
 #include "md.h"
 #include "jni_utils.h"

diff --git a/...com_canonical_openssl_kdf_OpenSSLPBKDF2.c → src/main/native/c/OpenSSLPBKDF2.c b/...com_canonical_openssl_kdf_OpenSSLPBKDF2.c → 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/...ical_openssl_signature_OpenSSLSignature.c → src/main/native/c/OpenSSLSignature.c b/...ical_openssl_signature_OpenSSLSignature.c → 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/...lation_OpenSSLKEMRSA_RSAKEMDecapsulator.c → src/main/native/c/RSAKEMDecapsulator.c b/...lation_OpenSSLKEMRSA_RSAKEMDecapsulator.c → src/main/native/c/RSAKEMDecapsulator.c
@@ -17,7 +17,7 @@
 #include <jni.h>
 #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/...lation_OpenSSLKEMRSA_RSAKEMEncapsulator.c → src/main/native/c/RSAKEMEncapsulator.c b/...lation_OpenSSLKEMRSA_RSAKEMEncapsulator.c → src/main/native/c/RSAKEMEncapsulator.c
@@ -17,7 +17,7 @@
 #include <jni.h>
 #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/..._canonical_openssl_cipher_OpenSSLCipher.h → src/main/native/include/jni/OpenSSLCipher.h b/..._canonical_openssl_cipher_OpenSSLCipher.h → src/main/native/include/jni/OpenSSLCipher.h
diff --git a/.../com_canonical_openssl_drbg_OpenSSLDrbg.h → src/main/native/include/jni/OpenSSLDrbg.h b/.../com_canonical_openssl_drbg_OpenSSLDrbg.h → src/main/native/include/jni/OpenSSLDrbg.h
diff --git a/...penssl_keyagreement_OpenSSLKeyAgreement.h → .../native/include/jni/OpenSSLKeyAgreement.h b/...penssl_keyagreement_OpenSSLKeyAgreement.h → .../native/include/jni/OpenSSLKeyAgreement.h
diff --git a/...ni/com_canonical_openssl_mac_OpenSSLMAC.h → src/main/native/include/jni/OpenSSLMAC.h b/...ni/com_canonical_openssl_mac_OpenSSLMAC.h → src/main/native/include/jni/OpenSSLMAC.h
diff --git a/.../jni/com_canonical_openssl_md_OpenSSLMD.h → src/main/native/include/jni/OpenSSLMD.h b/.../jni/com_canonical_openssl_md_OpenSSLMD.h → src/main/native/include/jni/OpenSSLMD.h
diff --git a/...com_canonical_openssl_kdf_OpenSSLPBKDF2.h → src/main/native/include/jni/OpenSSLPBKDF2.h b/...com_canonical_openssl_kdf_OpenSSLPBKDF2.h → src/main/native/include/jni/OpenSSLPBKDF2.h
diff --git a/...ical_openssl_signature_OpenSSLSignature.h → ...ain/native/include/jni/OpenSSLSignature.h b/...ical_openssl_signature_OpenSSLSignature.h → ...ain/native/include/jni/OpenSSLSignature.h
diff --git a/...lation_OpenSSLKEMRSA_RSAKEMDecapsulator.h → ...n/native/include/jni/RSAKEMDecapsulator.h b/...lation_OpenSSLKEMRSA_RSAKEMDecapsulator.h → ...n/native/include/jni/RSAKEMDecapsulator.h
diff --git a/...lation_OpenSSLKEMRSA_RSAKEMEncapsulator.h → ...n/native/include/jni/RSAKEMEncapsulator.h b/...lation_OpenSSLKEMRSA_RSAKEMEncapsulator.h → ...n/native/include/jni/RSAKEMEncapsulator.h