Skip to content

Commit

Permalink
Applied updates
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Jul 13, 2024
1 parent 477180a commit 03f12f5
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 6 deletions.
35 changes: 35 additions & 0 deletions .github/workflows/build_ossfuzz.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Build OSSFuzz fuzz targets from source.
name: build_ossfuzz
on:
push:
branches: [main]
permissions: read-all
jobs:
build_ossfuzz:
runs-on: ubuntu-22.04
strategy:
matrix:
include:
- architecture: 'x64'
compiler: 'gcc'
configure_options: ''
steps:
- name: Install build dependencies
run: |
sudo apt-get -y install git
- uses: actions/checkout@v4
with:
repository: google/oss-fuzz
path: oss-fuzz
- name: Build OSSFuzz fuzz targets
working-directory: oss-fuzz
run: |
mkdir -p projects/libfvde
cp projects/libyal/build.sh projects/libfvde/
cp projects/libyal/project.yaml projects/libfvde/
head -n 20 projects/libyal/Dockerfile > projects/libfvde/Dockerfile
echo "RUN git clone --depth 1 https://github.com/libyal/libfvde.git libfvde" >> projects/libfvde/Dockerfile
tail -n 3 projects/libyal/Dockerfile >> projects/libfvde/Dockerfile
python3 infra/helper.py build_image --pull libfvde
python3 infra/helper.py build_fuzzers --sanitizer address libfvde
python3 infra/helper.py check_build libfvde
5 changes: 1 addition & 4 deletions .github/workflows/build_shared.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,14 @@ jobs:
strategy:
matrix:
include:
- architecture: 'x64'
compiler: 'gcc'
configure_options: ''
- architecture: 'x64'
compiler: 'gcc'
configure_options: '--enable-wide-character-type'
steps:
- uses: actions/checkout@v4
- name: Install build dependencies
run: |
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libssl-dev libtool pkg-config zlib1g-dev
sudo apt-get -y install autoconf automake autopoint build-essential byacc flex git libfuse3-dev libssl-dev libtool pkg-config zlib1g-dev
- name: Download test data
run: |
if test -x "synctestdata.sh"; then ./synctestdata.sh; fi
Expand Down
3 changes: 3 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,9 @@ install:
Else {
.\syncdokan.ps1 }
}
- ps: If (($env:BUILD_ENVIRONMENT -eq "msbuild") -And (Test-Path ".\synctestdata.ps1")) {
.\synctestdata.ps1 }
- sh: if ( test ${BUILD_ENVIRONMENT} = "python-tox" || test ${BUILD_ENVIRONMENT} = "xcode" ) && test -f "./synctestdata.sh"; then ./synctestdata.sh; fi
- cmd: if [%TARGET%]==[vs2010] (
pushd ..\dokan &&
set PYTHONPATH=..\vstools &&
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ AC_PREREQ([2.71])

AC_INIT(
[libfvde],
[20240523],
[20240713],
[joachim.metz@gmail.com])

AC_CONFIG_SRCDIR(
Expand Down
3 changes: 2 additions & 1 deletion libfvde.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ authors: ["Omar Choudary <choudary.omar@gmail.com>", "Joachim Metz <joachim.metz
year_of_creation: "2011"
data_format: "FileVault Drive Encryption (FVDE) (or FileVault2)"
documentation_url: "https://github.com/libyal/libfvde/tree/main/documentation"
features: ["debug_output"]
features: ["debug_output", "ossfuzz", "python_bindings", "tools"]

[library]
build_dependencies: ["crypto", "lex", "yacc", "zlib"]
features: ["pthread", "wide_character_type"]
description: "Library to access the FileVault Drive Encryption (FVDE) format"
public_types: ["encryption_context_plist", "logical_volume", "physical_volume", "volume", "volume_group"]

Expand Down

0 comments on commit 03f12f5

Please sign in to comment.