From f3653b08a475372a0849cd9a3387a5997ce121c9 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Tue, 12 May 2015 13:51:02 -0400 Subject: Update Cryptlib and openssl Update Cryptlib to r16559 and openssl to 0.9.8zf Signed-off-by: Gary Ching-Pang Lin --- Cryptlib/OpenSSL/crypto/comp/c_rle.c | 91 ++++++++++++++++++------------------ 1 file changed, 46 insertions(+), 45 deletions(-) (limited to 'Cryptlib/OpenSSL/crypto/comp/c_rle.c') diff --git a/Cryptlib/OpenSSL/crypto/comp/c_rle.c b/Cryptlib/OpenSSL/crypto/comp/c_rle.c index 18bceae5..adf16631 100644 --- a/Cryptlib/OpenSSL/crypto/comp/c_rle.c +++ b/Cryptlib/OpenSSL/crypto/comp/c_rle.c @@ -5,57 +5,58 @@ #include static int rle_compress_block(COMP_CTX *ctx, unsigned char *out, - unsigned int olen, unsigned char *in, unsigned int ilen); + unsigned int olen, unsigned char *in, + unsigned int ilen); static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, - unsigned int olen, unsigned char *in, unsigned int ilen); - -static COMP_METHOD rle_method={ - NID_rle_compression, - LN_rle_compression, - NULL, - NULL, - rle_compress_block, - rle_expand_block, - NULL, - NULL, - }; + unsigned int olen, unsigned char *in, + unsigned int ilen); + +static COMP_METHOD rle_method = { + NID_rle_compression, + LN_rle_compression, + NULL, + NULL, + rle_compress_block, + rle_expand_block, + NULL, + NULL, +}; COMP_METHOD *COMP_rle(void) - { - return(&rle_method); - } +{ + return (&rle_method); +} static int rle_compress_block(COMP_CTX *ctx, unsigned char *out, - unsigned int olen, unsigned char *in, unsigned int ilen) - { - /* int i; */ + unsigned int olen, unsigned char *in, + unsigned int ilen) +{ + /* int i; */ - if (olen < (ilen+1)) - { - /* ZZZZZZZZZZZZZZZZZZZZZZ */ - return(-1); - } + if (olen < (ilen + 1)) { + /* ZZZZZZZZZZZZZZZZZZZZZZ */ + return (-1); + } - *(out++)=0; - memcpy(out,in,ilen); - return(ilen+1); - } + *(out++) = 0; + memcpy(out, in, ilen); + return (ilen + 1); +} static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, - unsigned int olen, unsigned char *in, unsigned int ilen) - { - int i; - - if (ilen == 0 || olen < (ilen-1)) - { - /* ZZZZZZZZZZZZZZZZZZZZZZ */ - return(-1); - } - - i= *(in++); - if (i == 0) - { - memcpy(out,in,ilen-1); - } - return(ilen-1); - } + unsigned int olen, unsigned char *in, + unsigned int ilen) +{ + int i; + + if (ilen == 0 || olen < (ilen - 1)) { + /* ZZZZZZZZZZZZZZZZZZZZZZ */ + return (-1); + } + + i = *(in++); + if (i == 0) { + memcpy(out, in, ilen - 1); + } + return (ilen - 1); +} -- cgit v1.2.3