github-starred/burp-ui
2
0
Fork 0
mirror of https://github.com/ziirish/burp-ui.git synced 2026-05-15 14:16:08 -06:00
Code Issues 1 Projects Packages Wiki Activity Actions

fix demo build

Browse source
This commit is contained in:
ziirish 2021-09-18 00:20:51 +02:00
parent 2273af93a4
commit a02ea54b64
No known key found for this signature in database
GPG key ID: 72DB229A64B54E46
5 changed files with 59 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docker/demo/docker-burp1/Dockerfile
View file

@ -1,7 +1,7 @@
FROM debian:bullseye
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libssl-dev librsync-dev python3-dev git python3-virtualenv python3-pip cron libffi-dev cargo \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libz-dev libssl-dev librsync-dev python3-dev git python3-virtualenv python3-pip cron libffi-dev cargo \
&& update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
&& locale-gen en_US.UTF-8 \
&& dpkg-reconfigure -f noninteractive locales \

3
docker/demo/docker-cli1/Dockerfile
View file

@ -1,7 +1,7 @@
FROM debian:bullseye
RUN apt-get update \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libssl-dev librsync-dev git cron \
&& DEBIAN_FRONTEND=noninteractive apt-get install -y supervisor logrotate locales wget curl uthash-dev g++ make libz-dev libssl-dev librsync-dev git cron \
&& update-locale LANG=C.UTF-8 LC_MESSAGES=POSIX \
&& locale-gen en_US.UTF-8 \
&& dpkg-reconfigure -f noninteractive locales \
@ -9,6 +9,7 @@ RUN apt-get update \
&& dpkg-reconfigure -f noninteractive tzdata \
&& rm -rf /var/lib/apt/lists/*
ADD assets/patch/ /app/patch/
ADD assets/setup/ /app/setup/
ADD assets/config/ /app/setup/config/

54
docker/demo/docker-cli1/assets/patch/burp-libssl1.1.patch Normal file
View file

@ -0,0 +1,54 @@
diff --git src/handy.c.orig src/handy.c
index 4d48597c..63cb6ebf 100644
--- src/handy.c.orig
+++ src/handy.c
@@ -279,18 +279,22 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, const char *encryption_password)
// compilation warnings on Macs.
unsigned char enc_iv[]={'[', 'l', 'k', 'd', '.', '$', 'G', 0xa3, '\0'};
- if(!(ctx=(EVP_CIPHER_CTX *)malloc(sizeof(EVP_CIPHER_CTX))))
+ if(!(ctx=(EVP_CIPHER_CTX *)EVP_CIPHER_CTX_new()))
{
log_out_of_memory(__FUNCTION__);
return NULL;
}
- memset(ctx, 0, sizeof(EVP_CIPHER_CTX));
// Don't set key or IV because we will modify the parameters.
EVP_CIPHER_CTX_init(ctx);
if(!(EVP_CipherInit_ex(ctx, EVP_bf_cbc(), NULL, NULL, NULL, encrypt)))
{
logp("EVP_CipherInit_ex failed\n");
- free(ctx);
+ if(ctx)
+ {
+ EVP_CIPHER_CTX_cleanup(ctx);
+ EVP_CIPHER_CTX_free(ctx);
+ ctx=NULL;
+ }
return NULL;
}
EVP_CIPHER_CTX_set_key_length(ctx, strlen(encryption_password));
@@ -301,7 +305,12 @@ EVP_CIPHER_CTX *enc_setup(int encrypt, const char *encryption_password)
enc_iv, encrypt))
{
logp("Second EVP_CipherInit_ex failed\n");
- free(ctx);
+ if(ctx)
+ {
+ EVP_CIPHER_CTX_cleanup(ctx);
+ EVP_CIPHER_CTX_free(ctx);
+ ctx=NULL;
+ }
return NULL;
}
return ctx;
@@ -592,7 +601,8 @@ cleanup:
if(enc_ctx)
{
EVP_CIPHER_CTX_cleanup(enc_ctx);
- free(enc_ctx);
+ EVP_CIPHER_CTX_free(enc_ctx);
+ enc_ctx=NULL;
}
if(!ret)

1
docker/demo/docker-cli1/assets/setup/install
View file

@ -11,6 +11,7 @@ git clone $BURP
cd burp
git checkout tags/$BURP_VERSION
./configure --disable-ipv6
patch -Np0 </app/patch/burp-libssl1.1.patch
make -j
make install

2
docker/demo/docker-cli2/assets/setup/install
View file

@ -4,7 +4,7 @@ set -e
SETUP_DIR="/app/setup"
CONFIG_DIR="${SETUP_DIR}/config"
echo "deb http://ziirish.info/repos/debian/stretch zi-stable main" >/etc/apt/sources.list.d/ziirish.list
echo "deb http://ziirish.info/repos/debian/bullseye zi-stable main" >/etc/apt/sources.list.d/ziirish.list
wget https://ziirish.info/repos/debian.gpg -O- | apt-key add -
apt-get update