4 files changed, 94 insertions, 19 deletions

diff --git a/src/libstrongswan/credentials/certificates/x509.h b/src/libstrongswan/credentials/certificates/x509.h
index a4f9d1ff3..9d4054710 100644
--- a/src/libstrongswan/credentials/certificates/x509.h
+++ b/src/libstrongswan/credentials/certificates/x509.h
@@ -37,10 +37,8 @@ enum x509_flag_t {
 	X509_AA = 			(1<<1),
 	/** cert has OCSP signer constraint */
 	X509_OCSP_SIGNER = 	(1<<2),
-	/** cert belongs to an end entity  */
-	X509_PEER =         (1<<3),
 	/** cert is self-signed */
-	X509_SELF_SIGNED =  (1<<4),
+	X509_SELF_SIGNED =  (1<<3),
 };
 
 /**
@@ -69,13 +67,6 @@ struct x509_t {
 	x509_flag_t (*get_flags)(x509_t *this);
 	
 	/**
-	 * Set the flags for this certificate.
-	 *
-	 * @param flags		set of flags
-	 */
-	void (*set_flags)(x509_t *this, x509_flag_t flags);
-	
-	/**
 	 * Get the certificate serial number.
 	 *
 	 * @return			chunk pointing to internal serial number
diff --git a/src/libstrongswan/credentials/keys/shared_key.c b/src/libstrongswan/credentials/keys/shared_key.c
index 66b45a003..1ca848b20 100644
--- a/src/libstrongswan/credentials/keys/shared_key.c
+++ b/src/libstrongswan/credentials/keys/shared_key.c
@@ -25,3 +25,87 @@ ENUM(shared_key_type_names, SHARED_ANY, SHARED_PIN,
 	"PIN",
 );
 
+typedef struct private_shared_key_t private_shared_key_t;
+
+/**
+ * private data of shared_key
+ */
+struct private_shared_key_t {
+
+	/**
+	 * public functions
+	 */
+	shared_key_t public;
+	
+	/**
+	 * type of this shared key
+	 */
+	shared_key_type_t type;
+	
+	/**
+	 * associated shared key data
+	 */
+	chunk_t key;
+	
+	/**
+	 * reference counter
+	 */
+	refcount_t ref;
+};
+
+/**
+ * Implements shared_key_t.get_type
+ */
+static shared_key_type_t get_type(private_shared_key_t *this)
+{
+	return this->type;
+}
+
+/**
+ * Implements shared_key_t.get_key
+ */
+static chunk_t get_key(private_shared_key_t *this)
+{
+	return this->key;
+}
+
+/**
+ * Implements shared_key_t.get_ref
+ */
+static shared_key_t* get_ref(private_shared_key_t *this)
+{
+	ref_get(&this->ref);
+	return &this->public;
+}
+
+/**
+ * Implementation of shared_key_t.destroy
+ */
+static void destroy(private_shared_key_t *this)
+{
+	if (ref_put(&this->ref))
+	{
+		free(this->key.ptr);
+		free(this);
+	}
+}
+
+/*
+ * see header file
+ */
+shared_key_t *shared_key_create(shared_key_type_t type, chunk_t key)
+{
+	private_shared_key_t *this = malloc_thing(private_shared_key_t);
+	
+	this->public.get_type = (shared_key_type_t (*)(shared_key_t *this))get_type;
+	this->public.get_key = (chunk_t (*)(shared_key_t *this))get_key;
+	this->public.get_ref = (shared_key_t* (*)(shared_key_t *this))get_ref;
+	this->public.destroy = (void(*)(shared_key_t*))destroy;
+	
+	this->type = type;
+	this->key = key;
+	this->ref = 1;
+	
+	return &this->public;
+}
+
diff --git a/src/libstrongswan/credentials/keys/shared_key.h b/src/libstrongswan/credentials/keys/shared_key.h
index 86586a7c7..ceb1309b7 100644
--- a/src/libstrongswan/credentials/keys/shared_key.h
+++ b/src/libstrongswan/credentials/keys/shared_key.h
@@ -83,4 +83,13 @@ struct shared_key_t {
     void (*destroy)(shared_key_t *this);
 };
 
+/**
+ * A simple private key implementation
+ *
+ * @param type		type of the shared key
+ * @param key		key data, gets owned by instance
+ * @return			simple shared key instance
+ */
+shared_key_t *shared_key_create(shared_key_type_t type, chunk_t key);
+
 #endif /** SHARED_KEY_H_ @} */
diff --git a/src/libstrongswan/plugins/x509/x509_cert.c b/src/libstrongswan/plugins/x509/x509_cert.c
index 47a841c51..a044c60a0 100644
--- a/src/libstrongswan/plugins/x509/x509_cert.c
+++ b/src/libstrongswan/plugins/x509/x509_cert.c
@@ -1012,14 +1012,6 @@ static private_x509_cert_t* get_ref(private_x509_cert_t *this)
 }
 
 /**
- * Implementation of x509_cert_t.set_flags.
- */
-static void set_flags(private_x509_cert_t *this, x509_flag_t flags)
-{
-	this->flags = flags;
-}
-
-/**
  * Implementation of x509_cert_t.get_flags.
  */
 static x509_flag_t get_flags(private_x509_cert_t *this)
@@ -1167,7 +1159,6 @@ static x509_cert_t *load(chunk_t chunk)
 	this->public.interface.interface.equals = (bool (*)(certificate_t*, certificate_t *other))equals;
 	this->public.interface.interface.get_ref = (certificate_t* (*)(certificate_t *this))get_ref;
 	this->public.interface.interface.destroy = (void (*)(certificate_t *this))destroy;
-	this->public.interface.set_flags = (void (*)(x509_t*, x509_flag_t flags))set_flags;
 	this->public.interface.get_flags = (x509_flag_t (*)(x509_t*))get_flags;
 	this->public.interface.get_serial = (chunk_t (*)(x509_t*))get_serial;
 	this->public.interface.get_authKeyIdentifier = (identification_t* (*)(x509_t*))get_authKeyIdentifier;