GNU General Public License for more details.
*/
+/* $Id$ */
#include "silcincludes.h"
return pkcs->pkcs->get_private_key(pkcs->context, len);
}
-/* Sets public key */
+/* Sets public key from SilcPublicKey. */
-int silc_pkcs_set_public_key(SilcPKCS pkcs, unsigned char *pk,
- unsigned int pk_len)
+int silc_pkcs_public_key_set(SilcPKCS pkcs, SilcPublicKey public_key)
+{
+ return pkcs->pkcs->set_public_key(pkcs->context, public_key->pk,
+ public_key->pk_len);
+}
+
+/* Sets public key from data. */
+
+int silc_pkcs_public_key_data_set(SilcPKCS pkcs, unsigned char *pk,
+ unsigned int pk_len)
{
return pkcs->pkcs->set_public_key(pkcs->context, pk, pk_len);
}
-/* Sets private key */
+/* Sets private key from SilcPrivateKey. */
+
+int silc_pkcs_private_key_set(SilcPKCS pkcs, SilcPrivateKey private_key)
+{
+ return pkcs->pkcs->set_private_key(pkcs->context, private_key->prv,
+ private_key->prv_len);
+}
+
+/* Sets private key from data. */
-int silc_pkcs_set_private_key(SilcPKCS pkcs, unsigned char *prv,
- unsigned int prv_len)
+int silc_pkcs_private_key_data_set(SilcPKCS pkcs, unsigned char *prv,
+ unsigned int prv_len)
{
return pkcs->pkcs->set_private_key(pkcs->context, prv, prv_len);
}
/* Encodes and returns SILC public key identifier. If some of the
- arguments as NULL those are not encoded into the identifier string.
+ arguments is NULL those are not encoded into the identifier string.
Protocol says that at least username and host must be provided. */
char *silc_pkcs_encode_identifier(char *username, char *host, char *realname,
SILC_STR_UI_SHORT(strlen(public_key->identifier)),
SILC_STR_UI32_STRING(public_key->identifier),
SILC_STR_UI_XNSTRING(public_key->pk,
- public_key->pk_len),
+ public_key->pk_len),
SILC_STR_END);
if (len)
*len = public_key->len;
static int silc_pkcs_save_public_key_internal(char *filename,
unsigned char *data,
- unsigned int data_len)
+ unsigned int data_len,
+ unsigned int encoding)
{
SilcBuffer buf;
unsigned int len;
+ switch(encoding) {
+ case SILC_PKCS_FILE_BIN:
+ break;
+ case SILC_PKCS_FILE_PEM:
+ data = silc_encode_pem_file(data, data_len);
+ data_len = strlen(data);
+ break;
+ }
+
len = data_len + (strlen(SILC_PKCS_PUBLIC_KEYFILE_BEGIN) +
strlen(SILC_PKCS_PUBLIC_KEYFILE_END));
buf = silc_buffer_alloc(len);
SILC_STR_UI32_STRING(SILC_PKCS_PUBLIC_KEYFILE_END),
SILC_STR_END);
- /* Save into a file */
+ /* Save into file */
if (silc_file_write(filename, buf->data, buf->len)) {
- memset(data, 0, data_len);
- silc_free(data);
silc_buffer_free(buf);
return FALSE;
}
- memset(data, 0, data_len);
- silc_free(data);
silc_buffer_free(buf);
return TRUE;
}
/* Saves public key into file */
-/* XXX encoding should be defined (PEM or binary). */
-int silc_pkcs_save_public_key(char *filename, SilcPublicKey public_key)
+int silc_pkcs_save_public_key(char *filename, SilcPublicKey public_key,
+ unsigned int encoding)
{
unsigned char *data;
unsigned int data_len;
data = silc_pkcs_public_key_encode(public_key, &data_len);
- return silc_pkcs_save_public_key_internal(filename, data, data_len);
+ return silc_pkcs_save_public_key_internal(filename, data, data_len,
+ encoding);
}
/* Saves public key into file */
-/* XXX encoding should be defined (PEM or binary). */
int silc_pkcs_save_public_key_data(char *filename, unsigned char *data,
- unsigned int data_len)
+ unsigned int data_len,
+ unsigned int encoding)
{
- return silc_pkcs_save_public_key_internal(filename, data, data_len);
+ return silc_pkcs_save_public_key_internal(filename, data, data_len,
+ encoding);
}
/* Internal routine to save private key. */
static int silc_pkcs_save_private_key_internal(char *filename,
unsigned char *data,
- unsigned int data_len)
+ unsigned int data_len,
+ unsigned int encoding)
{
SilcBuffer buf;
unsigned int len;
+ switch(encoding) {
+ case SILC_PKCS_FILE_BIN:
+ break;
+ case SILC_PKCS_FILE_PEM:
+ data = silc_encode_pem_file(data, data_len);
+ data_len = strlen(data);
+ break;
+ }
+
len = data_len + (strlen(SILC_PKCS_PRIVATE_KEYFILE_BEGIN) +
strlen(SILC_PKCS_PRIVATE_KEYFILE_END));
buf = silc_buffer_alloc(len);
/* Save into a file */
if (silc_file_write_mode(filename, buf->data, buf->len, 0600)) {
- memset(data, 0, data_len);
- silc_free(data);
silc_buffer_free(buf);
return FALSE;
}
- memset(data, 0, data_len);
- silc_free(data);
silc_buffer_free(buf);
return TRUE;
}
/* Saves private key into file. */
/* XXX The buffer should be encrypted if passphrase is provided. */
-/* XXX encoding should be defined (PEM or binary). */
int silc_pkcs_save_private_key(char *filename, SilcPrivateKey private_key,
- unsigned char *passphrase)
+ unsigned char *passphrase,
+ unsigned int encoding)
{
unsigned char *data;
unsigned int data_len;
data = silc_pkcs_private_key_encode(private_key, &data_len);
- return silc_pkcs_save_private_key_internal(filename, data, data_len);
+ return silc_pkcs_save_private_key_internal(filename, data, data_len,
+ encoding);
}
/* Saves private key into file. */
/* XXX The buffer should be encrypted if passphrase is provided. */
-/* XXX encoding should be defined (PEM or binary). */
int silc_pkcs_save_private_key_data(char *filename, unsigned char *data,
unsigned int data_len,
- unsigned char *passphrase)
+ unsigned char *passphrase,
+ unsigned int encoding)
{
- return silc_pkcs_save_private_key_internal(filename, data, data_len);
+ return silc_pkcs_save_private_key_internal(filename, data, data_len,
+ encoding);
}
/* Loads public key from file and allocates new public key. Returns TRUE
is loading was successful. */
-/* XXX Encoding should be defined. */
-int silc_pkcs_load_public_key(char *filename, SilcPublicKey *public_key)
+int silc_pkcs_load_public_key(char *filename, SilcPublicKey *public_key,
+ unsigned int encoding)
{
unsigned char *cp, *old, *data, byte;
unsigned int i, data_len, len;
if (public_key) {
len = data_len - (strlen(SILC_PKCS_PUBLIC_KEYFILE_BEGIN) +
strlen(SILC_PKCS_PUBLIC_KEYFILE_END));
- if (!silc_pkcs_public_key_decode(data, len, public_key)) {
+
+ switch(encoding) {
+ case SILC_PKCS_FILE_BIN:
+ break;
+ case SILC_PKCS_FILE_PEM:
+ data = silc_decode_pem(data, len, &len);
+ break;
+ }
+
+ if (!data || !silc_pkcs_public_key_decode(data, len, public_key)) {
memset(old, 0, data_len);
silc_free(old);
return FALSE;
/* Load private key from file and allocates new private key. Returns TRUE
if loading was successful. */
-/* XXX Encoding should be defined. */
/* XXX Should support encrypted private key files */
-int silc_pkcs_load_private_key(char *filename, SilcPrivateKey *private_key)
+int silc_pkcs_load_private_key(char *filename, SilcPrivateKey *private_key,
+ unsigned int encoding)
{
unsigned char *cp, *old, *data, byte;
unsigned int i, data_len, len;
if (private_key) {
len = data_len - (strlen(SILC_PKCS_PRIVATE_KEYFILE_BEGIN) +
strlen(SILC_PKCS_PRIVATE_KEYFILE_END));
- if (!silc_pkcs_private_key_decode(data, len, private_key)) {
+
+ switch(encoding) {
+ case SILC_PKCS_FILE_BIN:
+ break;
+ case SILC_PKCS_FILE_PEM:
+ data = silc_decode_pem(data, len, &len);
+ break;
+ }
+
+ if (!data || !silc_pkcs_private_key_decode(data, len, private_key)) {
memset(old, 0, data_len);
silc_free(old);
return FALSE;
projects / silc.git / blobdiff