diff options
author | 2018-10-23 14:24:54 -0700 | |
---|---|---|
committer | 2018-10-23 14:24:54 -0700 | |
commit | cf78fed63df95b20e4c350d61040636bc71030c1 (patch) | |
tree | 09ec6e6e70ca9f7ff294a95c972651a26f2f73db /projects/lzo | |
parent | 754db9eb6cb46ba148346cffc8410b718f31b8c0 (diff) |
Revert "[lzo] Add lzo (#1862)" (#1900)
This reverts commit 754db9eb6cb46ba148346cffc8410b718f31b8c0.
Diffstat (limited to 'projects/lzo')
-rw-r--r-- | projects/lzo/Dockerfile | 23 | ||||
-rwxr-xr-x | projects/lzo/build.sh | 35 | ||||
-rw-r--r-- | projects/lzo/lzo_compress_target.c | 78 | ||||
-rw-r--r-- | projects/lzo/lzo_compress_target.options | 2 | ||||
-rw-r--r-- | projects/lzo/lzo_decompress_target.c | 93 | ||||
-rw-r--r-- | projects/lzo/lzo_decompress_target.options | 2 | ||||
-rwxr-xr-x | projects/lzo/lzo_decompress_target_seeds/seed.lzo | bin | 217 -> 0 bytes | |||
-rw-r--r-- | projects/lzo/project.yaml | 8 |
8 files changed, 0 insertions, 241 deletions
diff --git a/projects/lzo/Dockerfile b/projects/lzo/Dockerfile deleted file mode 100644 index d6971e6f..00000000 --- a/projects/lzo/Dockerfile +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2018 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -FROM gcr.io/oss-fuzz-base/base-builder -MAINTAINER info@oberhumer.com -RUN apt-get update && apt-get install -y make autoconf automake libtool wget -RUN wget -O lzo.tar.gz \ - http://www.oberhumer.com/opensource/lzo/download/lzo-2.10.tar.gz -COPY *.c *.options build.sh $SRC/ -COPY lzo_decompress_target_seeds $SRC/lzo_decompress_target_seeds diff --git a/projects/lzo/build.sh b/projects/lzo/build.sh deleted file mode 100755 index 40a9a04b..00000000 --- a/projects/lzo/build.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -eu -# Copyright 2018 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ - -# build project -cd $SRC -tar xzf lzo.tar.gz -cd lzo-* -./configure && make -j$(nproc) - -# build fuzzers -for file in $SRC/*.c; -do - name=$(basename $file .c) - $CC -c -I include -I minilzo -I include/lzo ${file} -o ${name}.o - $CXX $CXXFLAGS -std=c++11 -I include -I minilzo -I include/lzo ${name}.o \ - -o $OUT/${name} -lFuzzingEngine src/.libs/liblzo2.a -done - -# copy fuzzer options -cp $SRC/*.options $OUT/ -zip -j $OUT/lzo_decompress_target_seed_corpus.zip $SRC/lzo_decompress_target_seeds/* diff --git a/projects/lzo/lzo_compress_target.c b/projects/lzo/lzo_compress_target.c deleted file mode 100644 index 897fcfef..00000000 --- a/projects/lzo/lzo_compress_target.c +++ /dev/null @@ -1,78 +0,0 @@ -/* -# Copyright 2018 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ -*/ - -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <stdbool.h> -#include <assert.h> -#include "minilzo.h" - -/* Work-memory needed for compression. Allocate memory in units - * of 'lzo_align_t' (instead of 'char') to make sure it is properly aligned. - */ -#define HEAP_ALLOC(var,size) \ - lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] - -static HEAP_ALLOC(wrkmem, LZO1X_1_MEM_COMPRESS); - -extern int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) -{ - int r; - lzo_uint out_len; - lzo_uint new_len; - /* We want to compress the data block at 'in' with length 'IN_LEN' to - * the block at 'out'. Because the input block may be incompressible, - * we must provide a little more output space in case that compression - * is not possible. - */ - unsigned char __LZO_MMODEL in[size]; - unsigned char __LZO_MMODEL out[size + size/16 + 64 + 3]; - - static bool isInit = false; - if (!isInit) - { - if (lzo_init() != LZO_E_OK) - { - printf("internal error - lzo_init() failed !!!\n"); - return 0; - } - isInit = true; - } - - /* Compress with LZO1X-1. */ - r = lzo1x_1_compress(data,size,out,&out_len,wrkmem); - assert(r == LZO_E_OK); - printf("compressed %lu bytes into %lu bytes\n", - (unsigned long) size, (unsigned long) out_len); - - /* check for an incompressible block */ - if (out_len >= size) - { - printf("This block contains incompressible data.\n"); - return 0; - } - - /* Decompress. */ - new_len = size; - r = lzo1x_decompress(out,out_len,in,&new_len,NULL); - assert(r == LZO_E_OK && new_len == size); - printf("decompressed %lu bytes back into %lu bytes\n", - (unsigned long) out_len, (unsigned long) size); - return 0; -} diff --git a/projects/lzo/lzo_compress_target.options b/projects/lzo/lzo_compress_target.options deleted file mode 100644 index 329a6e27..00000000 --- a/projects/lzo/lzo_compress_target.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -close_fd_mask = 3 diff --git a/projects/lzo/lzo_decompress_target.c b/projects/lzo/lzo_decompress_target.c deleted file mode 100644 index 92b289b5..00000000 --- a/projects/lzo/lzo_decompress_target.c +++ /dev/null @@ -1,93 +0,0 @@ -/* -# Copyright 2018 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -################################################################################ -*/ - -#include <stdio.h> -#include <stdlib.h> -#include <stdint.h> -#include <stdbool.h> -#include <assert.h> -#include "lzo1b.h" -#include "lzo1c.h" -#include "lzo1f.h" -#include "lzo1x.h" -#include "lzo1y.h" -#include "lzo1z.h" -#include "lzo2a.h" - -/* Work-memory needed for compression. Allocate memory in units - * of 'lzo_align_t' (instead of 'char') to make sure it is properly aligned. - */ -#define HEAP_ALLOC(var,size) \ - lzo_align_t __LZO_MMODEL var [ ((size) + (sizeof(lzo_align_t) - 1)) / sizeof(lzo_align_t) ] - -static HEAP_ALLOC(wrkmem, LZO1X_1_MEM_COMPRESS); - -typedef int (*decompress_function)( const lzo_bytep, lzo_uint , - lzo_bytep, lzo_uintp, - lzo_voidp ); - -#define NUM_DECOMP 7 - -static decompress_function funcArr[NUM_DECOMP] = -{ - &lzo1b_decompress_safe, - &lzo1c_decompress_safe, - &lzo1f_decompress_safe, - &lzo1x_decompress_safe, - &lzo1y_decompress_safe, - &lzo1z_decompress_safe, - &lzo2a_decompress_safe -}; - -extern int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) -{ - int r; - lzo_uint new_len; - if (size < 2){ - return 0; - } - /* We want to compress the data block at 'in' with length 'IN_LEN' to - * the block at 'out'. Because the input block may be incompressible, - * we must provide a little more output space in case that compression - * is not possible. - */ - unsigned char __LZO_MMODEL out[size]; - - static bool isInit = false; - if (!isInit) - { - if (lzo_init() != LZO_E_OK) - { - printf("internal error - lzo_init() failed !!!\n"); - return 0; - } - isInit = true; - } - - /* Decompress. */ - int idx = data[0] % NUM_DECOMP; - new_len = size; - r = (*funcArr[idx])(&data[1],size-1,out,&new_len,NULL); - if (r != LZO_E_OK) - { - printf("error thrown by lzo1x_decompress_safe: %d\n", r); - } - printf("decompressed %lu bytes back into %lu bytes\n", - (unsigned long) size, (unsigned long) new_len); - return 0; -} diff --git a/projects/lzo/lzo_decompress_target.options b/projects/lzo/lzo_decompress_target.options deleted file mode 100644 index 329a6e27..00000000 --- a/projects/lzo/lzo_decompress_target.options +++ /dev/null @@ -1,2 +0,0 @@ -[libfuzzer] -close_fd_mask = 3 diff --git a/projects/lzo/lzo_decompress_target_seeds/seed.lzo b/projects/lzo/lzo_decompress_target_seeds/seed.lzo Binary files differdeleted file mode 100755 index bf310368..00000000 --- a/projects/lzo/lzo_decompress_target_seeds/seed.lzo +++ /dev/null diff --git a/projects/lzo/project.yaml b/projects/lzo/project.yaml deleted file mode 100644 index ab698ac3..00000000 --- a/projects/lzo/project.yaml +++ /dev/null @@ -1,8 +0,0 @@ -homepage: "http://www.oberhumer.com" -primary_contact: "info@oberhumer.com" -auto_ccs: - - "bshas3@gmail.com" -sanitizers: - - address - - memory - - undefined |