diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2012-07-11 23:31:36 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2012-07-11 23:31:36 +0000 |
| commit | 0758ab5ea778e4ba36d2150af1bba602a48d6467 (patch) | |
| tree | 0c30591ac90cb5e07a0763793709fd1056b67f57 /crypto/comp | |
| parent | 2b8b5455829304396e38200c205612c4dc57c052 (diff) | |
Notes
Diffstat (limited to 'crypto/comp')
| -rw-r--r-- | crypto/comp/Makefile | 2 | ||||
| -rw-r--r-- | crypto/comp/c_rle.c | 4 | ||||
| -rw-r--r-- | crypto/comp/c_zlib.c | 1 | ||||
| -rw-r--r-- | crypto/comp/comp_err.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/crypto/comp/Makefile b/crypto/comp/Makefile index 5d364b85133b..efda832dce47 100644 --- a/crypto/comp/Makefile +++ b/crypto/comp/Makefile @@ -36,7 +36,7 @@ top: all: lib lib: $(LIBOBJ) - $(ARX) $(LIB) $(LIBOBJ) + $(AR) $(LIB) $(LIBOBJ) $(RANLIB) $(LIB) || echo Never mind. @touch lib diff --git a/crypto/comp/c_rle.c b/crypto/comp/c_rle.c index 18bceae51e76..47dfb67fbd52 100644 --- a/crypto/comp/c_rle.c +++ b/crypto/comp/c_rle.c @@ -30,7 +30,7 @@ static int rle_compress_block(COMP_CTX *ctx, unsigned char *out, { /* int i; */ - if (olen < (ilen+1)) + if (ilen == 0 || olen < (ilen-1)) { /* ZZZZZZZZZZZZZZZZZZZZZZ */ return(-1); @@ -46,7 +46,7 @@ static int rle_expand_block(COMP_CTX *ctx, unsigned char *out, { int i; - if (ilen == 0 || olen < (ilen-1)) + if (olen < (ilen-1)) { /* ZZZZZZZZZZZZZZZZZZZZZZ */ return(-1); diff --git a/crypto/comp/c_zlib.c b/crypto/comp/c_zlib.c index 8df7792c50b7..8adf35f3fc9c 100644 --- a/crypto/comp/c_zlib.c +++ b/crypto/comp/c_zlib.c @@ -781,6 +781,7 @@ static long bio_zlib_ctrl(BIO *b, int cmd, long num, void *ptr) default: ret = BIO_ctrl(b->next_bio, cmd, num, ptr); break; + } return ret; diff --git a/crypto/comp/comp_err.c b/crypto/comp/comp_err.c index 187d68b725ca..661c94c3a43b 100644 --- a/crypto/comp/comp_err.c +++ b/crypto/comp/comp_err.c @@ -1,6 +1,6 @@ /* crypto/comp/comp_err.c */ /* ==================================================================== - * Copyright (c) 1999-2008 The OpenSSL Project. All rights reserved. + * Copyright (c) 1999-2007 The OpenSSL Project. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions |