Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-blobdigest
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
libvmod-blobdigest
Commits
8548ae68
Unverified
Commit
8548ae68
authored
Apr 28, 2022
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Modernize build
parent
315fbd60
Changes
31
Hide whitespace changes
Inline
Side-by-side
Showing
31 changed files
with
112 additions
and
192 deletions
+112
-192
.gitignore
.gitignore
+8
-2
Makefile.am
Makefile.am
+4
-11
README.rst
README.rst
+1
-1
autogen.sh
autogen.sh
+9
-45
configure.ac
configure.ac
+19
-52
Makefile.am
src/Makefile.am
+18
-28
00basic.vtc
src/tests/00basic.vtc
+2
-2
crc32.vtc
src/tests/crc32.vtc
+1
-1
d00017.vtc
src/tests/d00017.vtc
+1
-1
d00020.vtc
src/tests/d00020.vtc
+1
-1
d00021.vtc
src/tests/d00021.vtc
+1
-1
d00022.vtc
src/tests/d00022.vtc
+1
-1
d00023.vtc
src/tests/d00023.vtc
+1
-1
d00024.vtc
src/tests/d00024.vtc
+1
-1
d00026.vtc
src/tests/d00026.vtc
+1
-1
esi.vtc
src/tests/esi.vtc
+1
-1
icrc32.vtc
src/tests/icrc32.vtc
+1
-1
md5.vtc
src/tests/md5.vtc
+4
-4
rs.vtc
src/tests/rs.vtc
+1
-1
sha1.vtc
src/tests/sha1.vtc
+3
-3
sha224.vtc
src/tests/sha224.vtc
+3
-3
sha256.vtc
src/tests/sha256.vtc
+3
-3
sha256_bench.vtc
src/tests/sha256_bench.vtc
+1
-1
sha3-224.vtc
src/tests/sha3-224.vtc
+3
-3
sha3-256.vtc
src/tests/sha3-256.vtc
+3
-3
sha3-384.vtc
src/tests/sha3-384.vtc
+3
-3
sha3-512.vtc
src/tests/sha3-512.vtc
+3
-3
sha384.vtc
src/tests/sha384.vtc
+3
-3
sha512.vtc
src/tests/sha512.vtc
+3
-3
usage.vtc
src/tests/usage.vtc
+7
-7
vmod_blobdigest.c
src/vmod_blobdigest.c
+1
-1
No files found.
.gitignore
View file @
8548ae68
...
@@ -25,9 +25,15 @@ Makefile.in
...
@@ -25,9 +25,15 @@ Makefile.in
/missing
/missing
/stamp-h1
/stamp-h1
/m4/
/m4/
/ar-lib
/build-aux
/src/vcc_if.c
/src/vcc_
*_
if.c
/src/vcc_if.h
/src/vcc_
*_
if.h
/src/vmod_*rst
/src/vmod_*rst
/src/parse_algorithm.c
/src/parse_algorithm.c
/src/parse_algorithm.h
/src/parse_algorithm.h
/src/tests/*.log
/src/tests/*.trs
libvmod-blobdigest-*.tar.gz
Makefile.am
View file @
8548ae68
ACLOCAL_AMFLAGS
=
-I
m4
-I
${
LIBVARNISHAPI_DATAROOTDIR
}
/aclocal
ACLOCAL_AMFLAGS
=
-I
m4
-I
@VARNISHAPI_DATAROOTDIR@
/aclocal
SUBDIRS
=
src
DISTCHECK_CONFIGURE_FLAGS
=
RST2MAN
=
:
DISTCHECK_CONFIGURE_FLAGS
=
\
SUBDIRS
=
src
VMOD_DIR
=
'$${libdir}/varnish/vmods'
EXTRA_DIST
=
README.rst LICENSE COPYING
# vmod-blobdigest.spec debian
EXTRA_DIST
=
README.rst LICENSE COPYING
# vmod-blobdigest.spec debian
...
@@ -11,6 +10,7 @@ doc_DATA = README.rst LICENSE COPYING
...
@@ -11,6 +10,7 @@ doc_DATA = README.rst LICENSE COPYING
dist_man_MANS
=
vmod_blobdigest.3
dist_man_MANS
=
vmod_blobdigest.3
MAINTAINERCLEANFILES
=
$(dist_man_MANS)
MAINTAINERCLEANFILES
=
$(dist_man_MANS)
CLEANFILES
=
README.rst
vmod_blobdigest.3
:
README.rst
vmod_blobdigest.3
:
README.rst
...
@@ -21,11 +21,4 @@ src/vmod_blobdigest.man.rst:
...
@@ -21,11 +21,4 @@ src/vmod_blobdigest.man.rst:
make
-C
src vmod_blobdigest.man.rst
make
-C
src vmod_blobdigest.man.rst
%.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9
:
%.1 %.2 %.3 %.4 %.5 %.6 %.7 %.8 %.9
:
if
HAVE_RST2MAN
${
RST2MAN
}
$<
$@
${
RST2MAN
}
$<
$@
else
@echo
"========================================"
@echo
"You need rst2man installed to make dist"
@echo
"========================================"
@false
endif
README.rst
View file @
8548ae68
..
..
.. NB: This file is machine generated, DO NOT EDIT!
.. NB: This file is machine generated, DO NOT EDIT!
..
..
.. Edit .
./src
/vmod_blobdigest.vcc and run make instead
.. Edit ./vmod_blobdigest.vcc and run make instead
..
..
.. role:: ref(emphasis)
.. role:: ref(emphasis)
...
...
autogen.sh
View file @
8548ae68
#!/bin/sh
#!/bin/sh
warn
()
{
set
-e
echo
"WARNING:
$@
"
1>&2
set
-u
}
case
`
uname
-s
`
in
if
!
command
-v
libtoolize
>
/dev/null
Darwin
)
then
LIBTOOLIZE
=
glibtoolize
echo
"libtoolize: command not found, falling back to glibtoolize"
>
&2
;;
alias
libtoolize
=
glibtoolize
FreeBSD
)
LIBTOOLIZE
=
libtoolize
;;
Linux
)
LIBTOOLIZE
=
libtoolize
;;
SunOS
)
LIBTOOLIZE
=
libtoolize
;;
*
)
warn
"unrecognized platform:"
`
uname
-s
`
LIBTOOLIZE
=
libtoolize
esac
automake_version
=
`
automake
--version
|
tr
' '
'\n'
| egrep
'^[0-9]\.[0-9a-z.-]+'
`
if
[
-z
"
$automake_version
"
]
;
then
warn
"unable to determine automake version"
else
case
$automake_version
in
0.
*
|
1.[0-8]|1.[0-8][.-]
*
)
warn
"automake (
$automake_version
) detected; 1.9 or newer recommended"
;;
*
)
;;
esac
fi
fi
# check for varnishapi.m4 in custom paths
mkdir
-p
m4
dataroot
=
$(
pkg-config
--variable
=
datarootdir varnishapi 2>/dev/null
)
aclocal
if
[
-z
"
$dataroot
"
]
;
then
libtoolize
--copy
--force
cat
>
&2
<<
'
EOF
'
Package varnishapi was not found in the pkg-config search path.
Perhaps you should add the directory containing `varnishapi.pc'
to the PKG_CONFIG_PATH environment variable
EOF
exit
1
fi
set
-ex
aclocal
-I
m4
-I
${
dataroot
}
/aclocal
$LIBTOOLIZE
--copy
--force
autoheader
autoheader
automake
--add-missing
--copy
--foreign
automake
--add-missing
--copy
--foreign
autoconf
autoconf
configure.ac
View file @
8548ae68
...
@@ -2,14 +2,25 @@ AC_PREREQ([2.69])
...
@@ -2,14 +2,25 @@ AC_PREREQ([2.69])
AC_COPYRIGHT([Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung])
AC_COPYRIGHT([Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung])
AC_INIT([libvmod-blobdigest],[1.1])
AC_INIT([libvmod-blobdigest],[1.1])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_MACRO_DIR([m4])
m4_ifndef([VARNISH_VMOD_INCLUDES], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
AC_CONFIG_AUX_DIR([build-aux])
m4_ifndef([VARNISH_VMODS], AC_MSG_ERROR([Need varnish.m4 -- see README.rst]))
AC_CONFIG_SRCDIR(src/vmod_blobdigest.vcc)
AC_CONFIG_SRCDIR(src/vmod_blobdigest.vcc)
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([config.h])
A
C_CANONICAL_TARGET
A
M_INIT_AUTOMAKE([1.12 -Wall -Werror foreign parallel-tests])
A
C_LANG(C
)
A
M_SILENT_RULES([yes]
)
AM_INIT_AUTOMAKE([foreign])
AC_ARG_WITH([rst2man],
AS_HELP_STRING(
[--with-rst2man=PATH],
[Location of rst2man (auto)]),
[RST2MAN="$withval"],
[AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], [])])
VARNISH_PREREQ([7.0.0])
VARNISH_VMODS([blobdigest])
AM_PROG_AR
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
...
@@ -19,16 +30,8 @@ CC="$PTHREAD_CC"
...
@@ -19,16 +30,8 @@ CC="$PTHREAD_CC"
LT_INIT([disable-static])
LT_INIT([disable-static])
AC_PROG_INSTALL
AC_PROG_INSTALL
LT_INIT
AC_PROG_MAKE_SET
AC_PROG_MAKE_SET
# Check for rst utilities
AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
if test "x$RST2MAN" = "xno"; then
AC_MSG_WARN([rst2man not found - not building man pages])
fi
AM_CONDITIONAL(HAVE_RST2MAN, [test "x$RST2MAN" != "xno"])
AC_CHECK_HEADERS([sys/types.h])
AC_CHECK_HEADERS([sys/types.h])
AC_CHECK_HEADERS([stdint.h])
AC_CHECK_HEADERS([stdint.h])
AC_CHECK_HEADERS([unistd.h])
AC_CHECK_HEADERS([unistd.h])
...
@@ -44,46 +47,6 @@ AC_TYPE_UINT32_T
...
@@ -44,46 +47,6 @@ AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
AC_TYPE_UINT64_T
AC_TYPE_UINT8_T
AC_TYPE_UINT8_T
# Checks for libtool
AC_PROG_CXX
# backwards compat with older pkg-config
# - pull in AC_DEFUN from pkg.m4
m4_ifndef([PKG_CHECK_VAR], [
# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
# -------------------------------------------
# Retrieves the value of the pkg-config variable for the given module.
AC_DEFUN([PKG_CHECK_VAR],
[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
_PKG_CONFIG([$1], [variable="][$3]["], [$2])
AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])# PKG_CHECK_VAR
])
PKG_CHECK_MODULES([libvarnishapi], [varnishapi])
PKG_CHECK_VAR([LIBVARNISHAPI_PREFIX], [varnishapi], [prefix])
PKG_CHECK_VAR([LIBVARNISHAPI_DATAROOTDIR], [varnishapi], [datarootdir])
PKG_CHECK_VAR([LIBVARNISHAPI_BINDIR], [varnishapi], [bindir])
PKG_CHECK_VAR([LIBVARNISHAPI_SBINDIR], [varnishapi], [sbindir])
AC_SUBST([LIBVARNISHAPI_DATAROOTDIR])
# Varnish include files tree
VARNISH_VMOD_INCLUDES
VARNISH_VMOD_DIR
VARNISH_VMODTOOL
# inherit the prefix from Varnish.
# acessing ac_ variable because AC_PREFIX_DEFAULT acts too early
ac_default_prefix=$LIBVARNISHAPI_PREFIX
AC_PATH_PROG([VARNISHTEST], [varnishtest], [],
[$LIBVARNISHAPI_BINDIR:$LIBVARNISHAPI_SBINDIR:$PATH])
AC_PATH_PROG([VARNISHD], [varnishd], [],
[$LIBVARNISHAPI_SBINDIR:$LIBVARNISHAPI_BINDIR:$PATH])
# --enable-stack-protector
# --enable-stack-protector
AC_ARG_ENABLE(stack-protector,
AC_ARG_ENABLE(stack-protector,
...
@@ -116,6 +79,10 @@ if test "x$enable_debugging" != "xno"; then
...
@@ -116,6 +79,10 @@ if test "x$enable_debugging" != "xno"; then
[])
[])
fi
fi
VMOD_TESTS="$(cd $srcdir/src && echo tests/*.vtc)"
AC_SUBST(VMOD_TESTS)
AM_SUBST_NOTMAKE(VMOD_TESTS)
AC_CONFIG_FILES([
AC_CONFIG_FILES([
Makefile
Makefile
src/Makefile
src/Makefile
...
...
src/Makefile.am
View file @
8548ae68
AM_C
PPFLAGS
=
@VMOD_INCLUDES@
-Wall
-Werror
-std
=
c99
AM_C
FLAGS
=
$(VARNISHAPI_CFLAGS)
vmoddir
=
@VMOD_DIR@
vmod_LTLIBRARIES
=
libvmod_blobdigest.la
vmod_LTLIBRARIES
=
libvmod_blobdigest.la
libvmod_blobdigest_la_LDFLAGS
=
-module
-export-dynamic
-avoid-version
-shared
libvmod_blobdigest_la_LDFLAGS
=
$(VMOD_LDFLAGS)
libvmod_blobdigest_la_SOURCES
=
\
libvmod_blobdigest_la_SOURCES
=
\
vmod_blobdigest.h
\
vmod_blobdigest.h
\
...
@@ -26,33 +25,24 @@ libvmod_blobdigest_la_SOURCES = \
...
@@ -26,33 +25,24 @@ libvmod_blobdigest_la_SOURCES = \
sha3.c
sha3.c
nodist_libvmod_blobdigest_la_SOURCES
=
\
nodist_libvmod_blobdigest_la_SOURCES
=
\
vcc_if.c
\
vcc_
blobdigest_
if.c
\
vcc_if.h
vcc_
blobdigest_
if.h
vmod_blobdigest.lo
:
vcc_if.c vcc_if.h
@BUILD_VMOD_BLOBDIGEST@
vcc_if.c
:
vcc_if.h
# Test suite
vcc_if.h vmod_blobdigest.man.rst
:
@VMODTOOL@ $(top_srcdir)/src/vmod_blobdigest.vcc
AM_TESTS_ENVIRONMENT
=
\
@
PYTHON@ @VMODTOOL@
$(top_srcdir)
/src/vmod_blobdigest.vcc
PATH
=
"
$(abs_builddir)
:
$(VARNISH_TEST_PATH)
:
$(PATH)
"
\
LD_LIBRARY_PATH
=
"
$(VARNISH_LIBRARY_PATH)
"
TEST_EXTENSIONS
=
.vtc
VTC_LOG_COMPILER
=
varnishtest
-v
AM_VTC_LOG_FLAGS
=
\
-p
vcl_path
=
"
$(abs_top_srcdir)
/vcl:
$(VARNISHAPI_VCLDIR)
"
\
-p
vmod_path
=
"
$(abs_builddir)
/.libs:
$(vmoddir)
:
$(VARNISHAPI_VMODDIR)
"
VMOD_TESTS
=
$(top_srcdir)
/src/tests/
*
.vtc
TESTS
=
@VMOD_TESTS@
.PHONY
:
$(VMOD_TESTS)
$(top_srcdir)/src/tests/*.vtc
:
libvmod_blobdigest.la
dist_doc_DATA
=
\
PATH
=
@LIBVARNISHAPI_SBINDIR@:
$$
PATH
\
vmod_blobdigest.vcc
\
@VARNISHTEST@
-Dvmod_topbuild
=
$(abs_top_builddir)
$@
$(TESTS)
check
:
$(VMOD_TESTS)
EXTRA_DIST
=
\
vmod_blobdigest.vcc
\
$(VMOD_TESTS)
CLEANFILES
=
\
$(builddir)
/vcc_if.c
\
$(builddir)
/vcc_if.h
\
$(builddir)
/vmod_blobdigest.rst
\
$(builddir)
/vmod_blobdigest.man.rst
\
$(builddir)
/../vmod_blobdigest.3
\
$(builddir)
/../README.rst
src/tests/00basic.vtc
View file @
8548ae68
...
@@ -5,7 +5,7 @@ varnishtest "vcl.use and .discard, and version string"
...
@@ -5,7 +5,7 @@ varnishtest "vcl.use and .discard, and version string"
server s1 {} -start
server s1 {} -start
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
} -start
} -start
varnish v1 -vcl+backend {}
varnish v1 -vcl+backend {}
...
@@ -22,7 +22,7 @@ varnish v1 -cli "vcl.discard vcl1"
...
@@ -22,7 +22,7 @@ varnish v1 -cli "vcl.discard vcl1"
varnish v1 -cli "vcl.list"
varnish v1 -cli "vcl.list"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
sub vcl_recv {
sub vcl_recv {
...
...
src/tests/crc32.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "CRC32 checksum"
...
@@ -4,7 +4,7 @@ varnishtest "CRC32 checksum"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/d00017.vtc
View file @
8548ae68
...
@@ -25,7 +25,7 @@ server s3 {
...
@@ -25,7 +25,7 @@ server s3 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import std;
import std;
import directors;
import directors;
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/d00020.vtc
View file @
8548ae68
...
@@ -17,7 +17,7 @@ server s3 {
...
@@ -17,7 +17,7 @@ server s3 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import directors;
import directors;
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/d00021.vtc
View file @
8548ae68
...
@@ -21,7 +21,7 @@ server s3 {
...
@@ -21,7 +21,7 @@ server s3 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import directors;
import directors;
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/d00022.vtc
View file @
8548ae68
...
@@ -29,7 +29,7 @@ server s3 {
...
@@ -29,7 +29,7 @@ server s3 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import directors;
import directors;
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/d00023.vtc
View file @
8548ae68
...
@@ -20,7 +20,7 @@ server s3 {
...
@@ -20,7 +20,7 @@ server s3 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import std;
import std;
import directors;
import directors;
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/d00024.vtc
View file @
8548ae68
...
@@ -22,7 +22,7 @@ server s3 {
...
@@ -22,7 +22,7 @@ server s3 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import directors;
import directors;
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/d00026.vtc
View file @
8548ae68
...
@@ -17,7 +17,7 @@ server s3 {
...
@@ -17,7 +17,7 @@ server s3 {
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import directors;
import directors;
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/esi.vtc
View file @
8548ae68
...
@@ -20,7 +20,7 @@ server s1 {
...
@@ -20,7 +20,7 @@ server s1 {
} -start
} -start
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
...
src/tests/icrc32.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "inverted CRC32 checksum"
...
@@ -4,7 +4,7 @@ varnishtest "inverted CRC32 checksum"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
import directors;
import directors;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/md5.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "MD5 hash"
...
@@ -4,7 +4,7 @@ varnishtest "MD5 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -253,7 +253,7 @@ server s1 -repeat 10 {
...
@@ -253,7 +253,7 @@ server s1 -repeat 10 {
} -start
} -start
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
@@ -335,7 +335,7 @@ client c1 -repeat 10 {
...
@@ -335,7 +335,7 @@ client c1 -repeat 10 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -429,7 +429,7 @@ client c1 {
...
@@ -429,7 +429,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/rs.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "RS checksum"
...
@@ -4,7 +4,7 @@ varnishtest "RS checksum"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
import directors;
import directors;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha1.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA1 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA1 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -285,7 +285,7 @@ client c1 {
...
@@ -285,7 +285,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -378,7 +378,7 @@ client c1 {
...
@@ -378,7 +378,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha224.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA224 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA224 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -251,7 +251,7 @@ client c1 {
...
@@ -251,7 +251,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -344,7 +344,7 @@ client c1 {
...
@@ -344,7 +344,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha256.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA256 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA256 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -236,7 +236,7 @@ client c1 {
...
@@ -236,7 +236,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -328,7 +328,7 @@ client c1 {
...
@@ -328,7 +328,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha256_bench.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA256 bench"
...
@@ -4,7 +4,7 @@ varnishtest "SHA256 bench"
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha3-224.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_224 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_224 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -236,7 +236,7 @@ client c1 {
...
@@ -236,7 +236,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -339,7 +339,7 @@ client c1 {
...
@@ -339,7 +339,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha3-256.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_256 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_256 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -236,7 +236,7 @@ client c1 {
...
@@ -236,7 +236,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -340,7 +340,7 @@ client c1 {
...
@@ -340,7 +340,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha3-384.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_384 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_384 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -236,7 +236,7 @@ client c1 {
...
@@ -236,7 +236,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -341,7 +341,7 @@ client c1 {
...
@@ -341,7 +341,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha3-512.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_512 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA3_512 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -236,7 +236,7 @@ client c1 {
...
@@ -236,7 +236,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -340,7 +340,7 @@ client c1 {
...
@@ -340,7 +340,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha384.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA384 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA384 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -221,7 +221,7 @@ client c1 {
...
@@ -221,7 +221,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -313,7 +313,7 @@ client c1 {
...
@@ -313,7 +313,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/sha512.vtc
View file @
8548ae68
...
@@ -4,7 +4,7 @@ varnishtest "SHA512 hash"
...
@@ -4,7 +4,7 @@ varnishtest "SHA512 hash"
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -221,7 +221,7 @@ client c1 {
...
@@ -221,7 +221,7 @@ client c1 {
# hmac object
# hmac object
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -313,7 +313,7 @@ client c1 {
...
@@ -313,7 +313,7 @@ client c1 {
# hmacf function
# hmacf function
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
...
src/tests/usage.vtc
View file @
8548ae68
...
@@ -6,7 +6,7 @@ varnishtest "usage restrictions"
...
@@ -6,7 +6,7 @@ varnishtest "usage restrictions"
# Test use of digest object methods in vcl_init and _fini
# Test use of digest object methods in vcl_init and _fini
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -62,7 +62,7 @@ server s1 {
...
@@ -62,7 +62,7 @@ server s1 {
} -start
} -start
varnish v1 -vcl+backend {
varnish v1 -vcl+backend {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
sub vcl_init {
sub vcl_init {
...
@@ -143,7 +143,7 @@ logexpect l0 -v v1 -d 1 -g vxid -q "VCL_Error" {
...
@@ -143,7 +143,7 @@ logexpect l0 -v v1 -d 1 -g vxid -q "VCL_Error" {
# digest.update() may not be called after digest.final()
# digest.update() may not be called after digest.final()
varnish v1 -errvcl {vmod blobdigest error: already finalized in d1.update()} {
varnish v1 -errvcl {vmod blobdigest error: already finalized in d1.update()} {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -166,7 +166,7 @@ varnish v1 -errvcl {vmod blobdigest error: already finalized in d1.update()} {
...
@@ -166,7 +166,7 @@ varnish v1 -errvcl {vmod blobdigest error: already finalized in d1.update()} {
}
}
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -209,7 +209,7 @@ logexpect l1 -wait
...
@@ -209,7 +209,7 @@ logexpect l1 -wait
# hash() is legal in vcl_init and vcl_fini (as of Varnish 5.0)
# hash() is legal in vcl_init and vcl_fini (as of Varnish 5.0)
varnish v2 -arg "-p debug=+vclrel" -vcl {
varnish v2 -arg "-p debug=+vclrel" -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
import std;
import std;
backend b { .host = "${bad_ip}"; }
backend b { .host = "${bad_ip}"; }
...
@@ -252,7 +252,7 @@ varnish v2 -stop
...
@@ -252,7 +252,7 @@ varnish v2 -stop
# # broken in varnish-cache master - but phk does not accept
# # broken in varnish-cache master - but phk does not accept
# # ref: https://github.com/varnishcache/varnish-cache/pull/2941
# # ref: https://github.com/varnishcache/varnish-cache/pull/2941
# varnish v1 -errvcl {vmod blobdigest error: key is NULL in fail constructor} {
# varnish v1 -errvcl {vmod blobdigest error: key is NULL in fail constructor} {
# import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
# import blobdigest;
# import blob;
# import blob;
# backend b { .host = "${bad_ip}"; }
# backend b { .host = "${bad_ip}"; }
#
#
...
@@ -263,7 +263,7 @@ varnish v2 -stop
...
@@ -263,7 +263,7 @@ varnish v2 -stop
# hmac method and hmacf function fail if msg or key is NULL
# hmac method and hmacf function fail if msg or key is NULL
varnish v1 -vcl {
varnish v1 -vcl {
import blobdigest
from "${vmod_topbuild}/src/.libs/libvmod_blobdigest.so"
;
import blobdigest;
import blob;
import blob;
backend bk { .host = "${bad_ip}"; }
backend bk { .host = "${bad_ip}"; }
...
...
src/vmod_blobdigest.c
View file @
8548ae68
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
#include "vsb.h"
#include "vsb.h"
#include "vtim.h"
#include "vtim.h"
#include "vcc_if.h"
#include "vcc_
blobdigest_
if.h"
#include "vmod_blobdigest.h"
#include "vmod_blobdigest.h"
#include "byte_order.h"
#include "byte_order.h"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment