projects
/
silc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
silc_pem_* routines renamed to silc_base64_*
[silc.git]
/
lib
/
silccrypt
/
silcpk.c
diff --git
a/lib/silccrypt/silcpk.c
b/lib/silccrypt/silcpk.c
index 128f46f7a8f2df79733e068429ba6afd09044e51..b934bdc89297362743319fbab47ca7b71f02fc50 100644
(file)
--- a/
lib/silccrypt/silcpk.c
+++ b/
lib/silccrypt/silcpk.c
@@
-327,7
+327,7
@@
SilcBool silc_pkcs_silc_import_public_key_file(unsigned char *filedata,
break;
case SILC_PKCS_FILE_BASE64:
break;
case SILC_PKCS_FILE_BASE64:
- data = silc_
pem
_decode(filedata, filedata_len, &filedata_len);
+ data = silc_
base64
_decode(filedata, filedata_len, &filedata_len);
if (!data)
return FALSE;
filedata = data;
if (!data)
return FALSE;
filedata = data;
@@
-365,6
+365,7
@@
int silc_pkcs_silc_import_public_key(unsigned char *key,
/* Get length */
ret = silc_buffer_unformat(&buf,
/* Get length */
ret = silc_buffer_unformat(&buf,
+ SILC_STR_ADVANCE,
SILC_STR_UI_INT(&totlen),
SILC_STR_END);
if (ret == -1)
SILC_STR_UI_INT(&totlen),
SILC_STR_END);
if (ret == -1)
@@
-380,7
+381,7
@@
int silc_pkcs_silc_import_public_key(unsigned char *key,
/* Get algorithm name and identifier */
ret =
silc_buffer_unformat(&buf,
/* Get algorithm name and identifier */
ret =
silc_buffer_unformat(&buf,
- SILC_STR_
OFFSET(4)
,
+ SILC_STR_
ADVANCE
,
SILC_STR_UI16_NSTRING_ALLOC(&pkcs_name, &pkcs_len),
SILC_STR_UI16_NSTRING_ALLOC(&ident, &identifier_len),
SILC_STR_END);
SILC_STR_UI16_NSTRING_ALLOC(&pkcs_name, &pkcs_len),
SILC_STR_UI16_NSTRING_ALLOC(&ident, &identifier_len),
SILC_STR_END);
@@
-392,11
+393,9
@@
int silc_pkcs_silc_import_public_key(unsigned char *key,
goto err;
/* Get key data */
goto err;
/* Get key data */
- silc_buffer_pull(&buf, 4 + 2 + pkcs_len + 2 + identifier_len);
keydata_len = silc_buffer_len(&buf);
ret = silc_buffer_unformat(&buf,
keydata_len = silc_buffer_len(&buf);
ret = silc_buffer_unformat(&buf,
- SILC_STR_UI_XNSTRING(&key_data,
- keydata_len),
+ SILC_STR_DATA(&key_data, keydata_len),
SILC_STR_END);
if (ret == -1)
goto err;
SILC_STR_END);
if (ret == -1)
goto err;
@@
-515,7
+514,7
@@
silc_pkcs_silc_export_public_key_file(void *public_key,
break;
case SILC_PKCS_FILE_BASE64:
break;
case SILC_PKCS_FILE_BASE64:
- data = silc_
pem
_encode_file(key, key_len);
+ data = silc_
base64
_encode_file(key, key_len);
if (!data)
return NULL;
silc_free(key);
if (!data)
return NULL;
silc_free(key);
@@
-806,7
+805,7
@@
SilcBool silc_pkcs_silc_import_private_key_file(unsigned char *filedata,
break;
case SILC_PKCS_FILE_BASE64:
break;
case SILC_PKCS_FILE_BASE64:
- data = silc_
pem
_decode(filedata, filedata_len, &len);
+ data = silc_
base64
_decode(filedata, filedata_len, &len);
if (!data)
return FALSE;
filedata = data;
if (!data)
return FALSE;
filedata = data;
@@
-1332,7
+1331,7
@@
silc_pkcs_silc_export_private_key_file(void *private_key,
break;
case SILC_PKCS_FILE_BASE64:
break;
case SILC_PKCS_FILE_BASE64:
- data = silc_
pem
_encode_file(enc->data, silc_buffer_len(enc));
+ data = silc_
base64
_encode_file(enc->data, silc_buffer_len(enc));
if (!data) {
silc_buffer_clear(enc);
silc_buffer_free(enc);
if (!data) {
silc_buffer_clear(enc);
silc_buffer_free(enc);