GNU General Public License for more details.
*/
+/* $Id$ */
#include "silcincludes.h"
}
silc_buffer_push(buf, buf->data - buf->head);
- identifier = silc_calloc(tlen, sizeof(*identifier));
+ identifier = silc_calloc(tlen + 1, sizeof(*identifier));
memcpy(identifier, buf->data, tlen);
silc_buffer_free(buf);
unsigned char *ret;
buf = silc_buffer_alloc(public_key->len);
- silc_buffer_pull_tail(buf, public_key->len);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
silc_buffer_format(buf,
SILC_STR_UI_INT(public_key->len),
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;
totlen = 4 + 2 + strlen(pkcs) + 2 + strlen(identifier) + pk_len;
buf = silc_buffer_alloc(totlen);
- silc_buffer_pull_tail(buf, totlen);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
silc_buffer_format(buf,
SILC_STR_UI_INT(totlen),
unsigned short pkcs_len, identifier_len;
unsigned int totlen, key_len;
unsigned char *pkcs_name = NULL, *ident = NULL, *key_data = NULL;
+ int ret;
buf = silc_buffer_alloc(data_len);
- silc_buffer_pull_tail(buf, data_len);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
silc_buffer_put(buf, data, data_len);
/* Get length */
- silc_buffer_unformat(buf,
- SILC_STR_UI_INT(&totlen),
- SILC_STR_END);
+ ret = silc_buffer_unformat(buf,
+ SILC_STR_UI_INT(&totlen),
+ SILC_STR_END);
+ if (ret == -1) {
+ silc_buffer_free(buf);
+ return FALSE;
+ }
if (totlen != data_len) {
silc_buffer_free(buf);
/* Get algorithm name and identifier */
silc_buffer_pull(buf, 4);
- silc_buffer_unformat(buf,
- SILC_STR_UI16_NSTRING_ALLOC(&pkcs_name, &pkcs_len),
- SILC_STR_UI16_NSTRING_ALLOC(&ident, &identifier_len),
- SILC_STR_END);
+ ret =
+ silc_buffer_unformat(buf,
+ SILC_STR_UI16_NSTRING_ALLOC(&pkcs_name, &pkcs_len),
+ SILC_STR_UI16_NSTRING_ALLOC(&ident, &identifier_len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
if (pkcs_len < 1 || identifier_len < 3 ||
pkcs_len + identifier_len > totlen)
/* Get key data. We assume that rest of the buffer is key data. */
silc_buffer_pull(buf, 2 + pkcs_len + 2 + identifier_len);
key_len = buf->len;
- silc_buffer_unformat(buf,
- SILC_STR_UI_XNSTRING_ALLOC(&key_data, key_len),
- SILC_STR_END);
+ ret = silc_buffer_unformat(buf,
+ SILC_STR_UI_XNSTRING_ALLOC(&key_data, key_len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
/* Try to set the key. If this fails the key must be malformed. This
code assumes that the PKCS routine checks the format of the key. */
totlen = 2 + strlen(private_key->name) + private_key->prv_len;
buf = silc_buffer_alloc(totlen);
- silc_buffer_pull_tail(buf, totlen);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
silc_buffer_format(buf,
SILC_STR_UI_SHORT(strlen(private_key->name)),
unsigned short pkcs_len;
unsigned int key_len;
unsigned char *pkcs_name = NULL, *key_data = NULL;
+ int ret;
buf = silc_buffer_alloc(data_len);
- silc_buffer_pull_tail(buf, data_len);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
silc_buffer_put(buf, data, data_len);
/* Get algorithm name and identifier */
- silc_buffer_unformat(buf,
- SILC_STR_UI16_NSTRING_ALLOC(&pkcs_name, &pkcs_len),
- SILC_STR_END);
+ ret =
+ silc_buffer_unformat(buf,
+ SILC_STR_UI16_NSTRING_ALLOC(&pkcs_name, &pkcs_len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
if (pkcs_len < 1 || pkcs_len > buf->truelen)
goto err;
/* Get key data. We assume that rest of the buffer is key data. */
silc_buffer_pull(buf, 2 + pkcs_len);
key_len = buf->len;
- silc_buffer_unformat(buf,
- SILC_STR_UI_XNSTRING_ALLOC(&key_data, key_len),
- SILC_STR_END);
+ ret = silc_buffer_unformat(buf,
+ SILC_STR_UI_XNSTRING_ALLOC(&key_data, key_len),
+ SILC_STR_END);
+ if (ret == -1)
+ goto err;
/* Try to set the key. If this fails the key must be malformed. This
code assumes that the PKCS routine checks the format of the key. */
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_buffer_pull_tail(buf, len);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
silc_buffer_format(buf,
SILC_STR_UI32_STRING(SILC_PKCS_PUBLIC_KEYFILE_BEGIN),
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)) {
silc_buffer_free(buf);
return FALSE;
}
/* 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);
- silc_buffer_pull_tail(buf, len);
+ silc_buffer_pull_tail(buf, SILC_BUFFER_END(buf));
silc_buffer_format(buf,
SILC_STR_UI32_STRING(SILC_PKCS_PRIVATE_KEYFILE_BEGIN),
/* 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