I've reorganized the base64 code again. The goal has been to support
*both* simple "one-shot" encoding, and streamed operation. The
declarations from the new base64.h are included below. For the actual
code, see the cvs repository
(http://cvs.lysator.liu.se/viewcvs/viewcvs.cgi/lsh/src/nettle/?cvsroot=lsh).
Comments are welcome.
/Niels
#define BASE64_BINARY_BLOCK_SIZE 3
#define BASE64_TEXT_BLOCK_SIZE 4
/* Base64 encoding */
/* Maximum length of output for base64_encode_update. NOTE: Doesn't
* include any padding that base64_encode_final may add. */
/* We have at most 4 buffered bits, and a total of (4 + length * 8) bits. */
#define BASE64_ENCODE_LENGTH(length) (((length) * 8 + 4)/6)
/* Maximum lengbth of output generated by base64_encode_final. */
#define BASE64_ENCODE_FINAL_LENGTH 3
/* Exact length of output generated by base64_encode_raw, including
* padding. */
#define BASE64_ENCODE_RAW_LENGTH(length) ((((length) + 2)/3)*4)
struct base64_encode_ctx
{
unsigned word; /* Leftover bits */
unsigned bits; /* Number of bits, always 0, 2, or 4. */
};
void
base64_encode_init(struct base64_encode_ctx *ctx);
/* Encodes a single byte. Returns amoutn of output (always 1 or 2). */
unsigned
base64_encode_single(struct base64_encode_ctx *ctx,
uint8_t *dst,
uint8_t src);
/* Returns the number of output characters. DST should point to an
* area of size at least BASE64_ENCODE_LENGTH(length). */
unsigned
base64_encode_update(struct base64_encode_ctx *ctx,
uint8_t *dst,
unsigned length,
const uint8_t *src);
/* DST should point to an area of size at least
* BASE64_ENCODE_FINAL_SIZE */
unsigned
base64_encode_final(struct base64_encode_ctx *ctx,
uint8_t *dst);
/* Lower level functions */
/* Encodes a string in one go, including any padding at the end.
* Generates exactly BASE64_ENCODE_RAW_LENGTH(length) bytes of output.
* Supports overlapped operation, if src <= dst. */
void
base64_encode_raw(uint8_t *dst, unsigned length, const uint8_t *src);
void
base64_encode_group(uint8_t *dst, uint32_t group);
/* Base64 decoding */
/* Maximum length of output for base64_decode_update. */
/* We have at most 6 buffered bits, and a total of (length + 1) * 6 bits. */
#define BASE64_DECODE_LENGTH(length) ((((length) + 1) * 6) / 8)
struct base64_decode_ctx
{
enum
{
BASE64_DECODE_OK,
BASE64_DECODE_ERROR,
BASE64_DECODE_END
} status;
unsigned word; /* Leftover bits */
unsigned bits; /* Number buffered bits */
};
void
base64_decode_init(struct base64_decode_ctx *ctx);
/* Returns the number of output characters. DST should point to an
* area of size at least BASE64_DECODE_LENGTH(length). */
unsigned
base64_decode_update(struct base64_decode_ctx *ctx,
uint8_t *dst,
unsigned length,
const uint8_t *src);
/* Returns 1 on success. */
int
base64_decode_status(struct base64_decode_ctx *ctx);
#endif /* NETTLE_BASE64_H_INCLUDED */
NEWS for the 1.6 release
Optimized assembler implementations of aes, for sparc and x86.
The aes interface has changed slightly. The function
aes_set_key is no more. Instead one has to use
aes_set_encrypt_key or aes_set_decrypt_key. Sorry about that.
New example programs, rsa-keygen, rsa-sign and rsa-verify,
located in the examples directory.
New configure option --enable-shared, which builds a shared
library. Not tested.
New experimental features, including sexp parsing and
formatting, and changes to base64 encoding and decoding. The
interfaces to these functions are subject to change, and are
documented only in the source code.
I'll appreciate comments on the new things, in particular the
--enable-shared option, and the new sexp functions, which probably can
be simplified a little.
I've also created a nettle mailing list, see <URL:
http://lists.lysator.liu.se/mailman/listinfo/nettle-bugs> for
subscription information. I expect it to be a low-volume list.
Further announcements of nettle releases will be sent to that list,
and probably not to the lsh or the gcrypt lists.
nettle-1.6 is available at
http://www.lysator.liu.se/~nisse/archive
ftp://ftp.lysator.liu.se/pub/security/lsh
Happy hacking,
/Niels Möller
