From ddc5929e37004cc91c5ff7d61ee5f6d037193dc4 Mon Sep 17 00:00:00 2001 From: Pekka Riikonen Date: Sun, 14 Jan 2007 15:28:12 +0000 Subject: [PATCH] silc_pem_* routines renamed to silc_base64_*. --- lib/silcutil/silcbuffmt.h | 20 ++++++++++---------- lib/silcutil/silcstrutil.c | 23 ++++++++++++----------- lib/silcutil/silcstrutil.h | 35 ++++++++++++++++++----------------- 3 files changed, 40 insertions(+), 38 deletions(-) diff --git a/lib/silcutil/silcbuffmt.h b/lib/silcutil/silcbuffmt.h index 59004b0f..2c7b1d64 100644 --- a/lib/silcutil/silcbuffmt.h +++ b/lib/silcutil/silcbuffmt.h @@ -344,7 +344,7 @@ int silc_buffer_sunformat_vp(SilcStack stack, SilcBuffer src, va_list ap); * * Formats a buffer from variable argument list of strings. Each * string must be NULL-terminated and the variable argument list must - * be end with SILC_STR_END argument. This allows that a string in + * be end with SILC_STRFMT_END argument. This allows that a string in * the list can be NULL, in which case it is skipped. This automatically * allocates the space for the buffer data but `dst' must be already * allocated by the caller. @@ -368,7 +368,7 @@ int silc_buffer_strformat(SilcBuffer dst, ...); * * Formats a buffer from variable argument list of strings. Each * string must be NULL-terminated and the variable argument list must - * be end with SILC_STR_END argument. This allows that a string in + * be end with SILC_STRFMT_END argument. This allows that a string in * the list can be NULL, in which case it is skipped. This automatically * allocates the space for the buffer data but `dst' must be already * allocated by the caller. This function is equivalent to @@ -462,9 +462,9 @@ typedef enum { * * SilcInt16/SilcUInt16. * - * Formatting: SILC_STR_SI_SHORT(short) + * Formatting: SILC_STR_SI_SHORT(SilcInt16) * SILC_STR_UI_SHORT(SilcUInt16) - * Unformatting: SILC_STR_SI_SHORT(short *) + * Unformatting: SILC_STR_SI_SHORT(SilcInt16 *) * SILC_STR_UI_SHORT(SilcUInt16 *) * ***/ @@ -482,9 +482,9 @@ typedef enum { * * SilcInt32/SilcUInt32. * - * Formatting: SILC_STR_SI_INT(int) + * Formatting: SILC_STR_SI_INT(SilcInt32) * SILC_STR_UI_INT(SilcUInt32) - * Unformatting: SILC_STR_SI_INT(int *) + * Unformatting: SILC_STR_SI_INT(SilcInt32 *) * SILC_STR_UI_INT(SilcUInt32 *) * ***/ @@ -502,10 +502,10 @@ typedef enum { * * SilcInt64/SilcUInt64. * - * Formatting: SILC_STR_SI_INT64(int) - * SILC_STR_UI_INT64(SilcUInt32) - * Unformatting: SILC_STR_SI_INT64(int *) - * SILC_STR_UI_INT64(SilcUInt32 *) + * Formatting: SILC_STR_SI_INT64(SilcInt64) + * SILC_STR_UI_INT64(SilcUInt64) + * Unformatting: SILC_STR_SI_INT64(SilcInt64 *) + * SILC_STR_UI_INT64(SilcUInt64 *) * ***/ #define SILC_STR_SI_INT64(x) SILC_PARAM_SI64_INT, (x) diff --git a/lib/silcutil/silcstrutil.c b/lib/silcutil/silcstrutil.c index 1c537c11..d4df9693 100644 --- a/lib/silcutil/silcstrutil.c +++ b/lib/silcutil/silcstrutil.c @@ -24,10 +24,10 @@ static unsigned char pem_enc[64] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; -/* Encodes data into PEM encoding. Returns NULL terminated PEM encoded +/* Encodes data into Base 64 encoding. Returns NULL terminated base 64 encoded data string. */ -char *silc_pem_encode(unsigned char *data, SilcUInt32 len) +char *silc_base64_encode(unsigned char *data, SilcUInt32 len) { int i, j; SilcUInt32 bits, c, char_count; @@ -75,13 +75,13 @@ char *silc_pem_encode(unsigned char *data, SilcUInt32 len) /* Same as above but puts newline ('\n') every 72 characters. */ -char *silc_pem_encode_file(unsigned char *data, SilcUInt32 data_len) +char *silc_base64_encode_file(unsigned char *data, SilcUInt32 data_len) { int i, j; SilcUInt32 len, cols; char *pem, *pem2; - pem = silc_pem_encode(data, data_len); + pem = silc_base64_encode(data, data_len); len = strlen(pem); pem2 = silc_calloc(len + (len / 72) + 1, sizeof(*pem2)); @@ -101,10 +101,11 @@ char *silc_pem_encode_file(unsigned char *data, SilcUInt32 data_len) return pem2; } -/* Decodes PEM into data. Returns the decoded data. */ +/* Decodes Base 64 into data. Returns the decoded data. */ -unsigned char *silc_pem_decode(unsigned char *pem, SilcUInt32 pem_len, - SilcUInt32 *ret_len) +unsigned char *silc_base64_decode(unsigned char *base64, + SilcUInt32 base64_len, + SilcUInt32 *ret_len) { int i, j; SilcUInt32 len, c, char_count, bits; @@ -120,15 +121,15 @@ unsigned char *silc_pem_decode(unsigned char *pem, SilcUInt32 pem_len, bits = 0; j = 0; - if (!pem_len) - len = strlen(pem); + if (!base64_len) + len = strlen(base64); else - len = pem_len; + len = base64_len; data = silc_calloc(((len * 6) / 8), sizeof(*data)); for (i = 0; i < len; i++) { - c = pem[i]; + c = base64[i]; if (c == '=') break; diff --git a/lib/silcutil/silcstrutil.h b/lib/silcutil/silcstrutil.h index 26defd31..490f8dd5 100644 --- a/lib/silcutil/silcstrutil.h +++ b/lib/silcutil/silcstrutil.h @@ -67,49 +67,50 @@ typedef enum { } SilcStringEncoding; /***/ -/****f* silcutil/SilcStrUtilAPI/silc_pem_encode +/****f* silcutil/SilcStrUtilAPI/silc_base64_encode * * SYNOPSIS * - * char *silc_pem_encode(unsigned char *data, SilcUInt32 len); + * char *silc_base64_encode(unsigned char *data, SilcUInt32 len); * * DESCRIPTION * - * Encodes data into PEM encoding. Returns NULL terminated PEM encoded - * data string. Note: This is originally public domain code and is - * still PD. + * Encodes data into Base 64 (PEM) encoding. Returns NULL terminated + * Base 64 encoded data string. * ***/ -char *silc_pem_encode(unsigned char *data, SilcUInt32 len); +char *silc_base64_encode(unsigned char *data, SilcUInt32 len); -/****f* silcutil/SilcStrUtilAPI/silc_pem_encode_file +/****f* silcutil/SilcStrUtilAPI/silc_base64_encode_file * * SYNOPSIS * - * char *silc_pem_encode_file(unsigned char *data, SilcUInt32 data_len); + * char *silc_base64_encode_file(unsigned char *data, SilcUInt32 data_len); * * DESCRIPTION * - * Same as silc_pem_encode() but puts newline ('\n') every 72 characters. + * Same as silc_base64_encode() but puts newline ('\n') every 72 + * characters. * ***/ -char *silc_pem_encode_file(unsigned char *data, SilcUInt32 data_len); +char *silc_base64_encode_file(unsigned char *data, SilcUInt32 data_len); -/****f* silcutil/SilcStrUtilAPI/silc_pem_decode +/****f* silcutil/SilcStrUtilAPI/silc_base_decode * * SYNOPSIS * - * unsigned char *silc_pem_decode(unsigned char *pem, SilcUInt32 pem_len, - * SilcUInt32 *ret_len); + * unsigned char *silc_base_decode(unsigned char *base64, + * SilcUInt32 base64_len, + * SilcUInt32 *ret_len); * * DESCRIPTION * - * Decodes PEM into data. Returns the decoded data. Note: This is - * originally public domain code and is still PD. + * Decodes Base 64 (PEM) into data. Returns the decoded data. * ***/ -unsigned char *silc_pem_decode(unsigned char *pem, SilcUInt32 pem_len, - SilcUInt32 *ret_len); +unsigned char *silc_base64_decode(unsigned char *base64, + SilcUInt32 base64_len, + SilcUInt32 *ret_len); /****f* silcutil/SilcStrStrUtilAPI/silc_strncat * -- 2.24.0