Moved keys/key_encoding.[ch] to cred_encoding.[ch]

diff --git a/src/libstrongswan/Android.mk b/src/libstrongswan/Android.mk
index 34bd5e5b134d1dc26efe48e63fcf1d9207b7c20e..1931dfa45c934961e8e4a39f8ab607bd9f44bdee 100644 (file)
--- a/src/libstrongswan/Android.mk
+++ b/src/libstrongswan/Android.mk
@@ -26,7 +26,7 @@ crypto/diffie_hellman.c crypto/diffie_hellman.h \
 crypto/transform.c crypto/transform.h \
 credentials/credential_factory.c credentials/credential_factory.h \
 credentials/builder.c credentials/builder.h \
-credentials/keys/key_encoding.c credentials/keys/key_encoding.h \
+credentials/cred_encoding.c credentials/cred_encoding.h \
 credentials/keys/private_key.c credentials/keys/private_key.h \
 credentials/keys/public_key.c credentials/keys/public_key.h \
 credentials/keys/shared_key.c credentials/keys/shared_key.h \

diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index eb0ceb5305549b75da0fdb0f088e9ab4b35ee493..3678abd5dc313d5ac48adeb3fa3e35e1a368538d 100644 (file)
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -24,7 +24,7 @@ crypto/diffie_hellman.c crypto/diffie_hellman.h \
 crypto/transform.c crypto/transform.h \
 credentials/credential_factory.c credentials/credential_factory.h \
 credentials/builder.c credentials/builder.h \
-credentials/keys/key_encoding.c credentials/keys/key_encoding.h \
+credentials/cred_encoding.c credentials/cred_encoding.h \
 credentials/keys/private_key.c credentials/keys/private_key.h \
 credentials/keys/public_key.c credentials/keys/public_key.h \
 credentials/keys/shared_key.c credentials/keys/shared_key.h \

diff --git a/src/libstrongswan/credentials/keys/key_encoding.c b/src/libstrongswan/credentials/cred_encoding.c
similarity index 99%
rename from src/libstrongswan/credentials/keys/key_encoding.c
rename to src/libstrongswan/credentials/cred_encoding.c
index d76ad0b239896783e981880dbf06ecd3f4ada026..2969b3e087acb565bf5f8d68982c758117964d0c 100644 (file)
--- a/src/libstrongswan/credentials/keys/key_encoding.c
+++ b/src/libstrongswan/credentials/cred_encoding.c
@@ -13,7 +13,7 @@
  * for more details.
  */
 
-#include "key_encoding.h"
+#include "cred_encoding.h"
 
 #include <stdint.h>
 

diff --git a/src/libstrongswan/credentials/keys/key_encoding.h b/src/libstrongswan/credentials/cred_encoding.h
similarity index 100%
rename from src/libstrongswan/credentials/keys/key_encoding.h
rename to src/libstrongswan/credentials/cred_encoding.h

diff --git a/src/libstrongswan/credentials/keys/private_key.h b/src/libstrongswan/credentials/keys/private_key.h
index dcd80ae4638191b78ea770623c94dd2d4f8812b4..0ff186f0201f5e5a32f40dafc6df5952cb0a6c26 100644 (file)
--- a/src/libstrongswan/credentials/keys/private_key.h
+++ b/src/libstrongswan/credentials/keys/private_key.h
@@ -23,7 +23,7 @@
 
 typedef struct private_key_t private_key_t;
 
-#include <credentials/keys/key_encoding.h>
+#include <credentials/cred_encoding.h>
 #include <credentials/keys/public_key.h>
 
 /**

diff --git a/src/libstrongswan/credentials/keys/public_key.h b/src/libstrongswan/credentials/keys/public_key.h
index a421e7b5bf3dc03722e19dade92e8491405971f9..33ad9418e389232299a41d53f6a569d1a223e391 100644 (file)
--- a/src/libstrongswan/credentials/keys/public_key.h
+++ b/src/libstrongswan/credentials/keys/public_key.h
@@ -28,7 +28,7 @@ typedef enum signature_scheme_t signature_scheme_t;
 
 #include <library.h>
 #include <utils/identification.h>
-#include <credentials/keys/key_encoding.h>
+#include <credentials/cred_encoding.h>
 
 /**
  * Type of a key pair, the used crypto system

diff --git a/src/libstrongswan/library.h b/src/libstrongswan/library.h
index 060c82457583796b608b09dd215924c5ae1313bf..f9300cefc2ecab3232020ca3fec54848d1b2986e 100644 (file)
--- a/src/libstrongswan/library.h
+++ b/src/libstrongswan/library.h
@@ -69,7 +69,7 @@
 #include "database/database_factory.h"
 #include "credentials/credential_factory.h"
 #include "credentials/credential_manager.h"
-#include "credentials/keys/key_encoding.h"
+#include "credentials/cred_encoding.h"
 
 typedef struct library_t library_t;
 

diff --git a/src/libstrongswan/plugins/pem/pem_encoder.h b/src/libstrongswan/plugins/pem/pem_encoder.h
index a181133b7fb50520f1f08a238ec1a1dd99f27fb2..b9c1014ddb54e6f8e4f8b55aef4efba79c771b34 100644 (file)
--- a/src/libstrongswan/plugins/pem/pem_encoder.h
+++ b/src/libstrongswan/plugins/pem/pem_encoder.h
@@ -21,7 +21,7 @@
 #ifndef PEM_ENCODER_H_
 #define PEM_ENCODER_H_
 
-#include <credentials/keys/key_encoding.h>
+#include <credentials/cred_encoding.h>
 
 /**
  * Encoding from ASN.1 to PEM format.

diff --git a/src/libstrongswan/plugins/pgp/pgp_encoder.h b/src/libstrongswan/plugins/pgp/pgp_encoder.h
index 9df143399e6257343c0bd0b666ddd0d269e86c3b..cda3dc4aebe98d94ab4295a4fc890f1ce43f68db 100644 (file)
--- a/src/libstrongswan/plugins/pgp/pgp_encoder.h
+++ b/src/libstrongswan/plugins/pgp/pgp_encoder.h
@@ -21,7 +21,7 @@
 #ifndef PGP_ENCODER_H_
 #define PGP_ENCODER_H_
 
-#include <credentials/keys/key_encoding.h>
+#include <credentials/cred_encoding.h>
 
 /**
  * Encoding function for PGP fingerprints.

diff --git a/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.h b/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.h
index 11d9f27f28cf38e9a3b04902046ebf7155ff1046..a3653cdd8e7940e1f206f5da78ebdbd921c78685 100644 (file)
--- a/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.h
+++ b/src/libstrongswan/plugins/pkcs1/pkcs1_encoder.h
@@ -21,7 +21,7 @@
 #ifndef PKCS1_ENCODER_H_
 #define PKCS1_ENCODER_H_
 
-#include <credentials/keys/key_encoding.h>
+#include <credentials/cred_encoding.h>
 
 /**
  * Encoding function for PKCS#1/ASN.1 fingerprints/key formats.