Merge branch 'master' into packet-api-rewrite
Conflicts: src/knot/server/tcp-handler.c
Showing
- src/Makefile.am 2 additions, 1 deletionsrc/Makefile.am
- src/knot/main.c 13 additions, 2 deletionssrc/knot/main.c
- src/knot/server/server.c 2 additions, 5 deletionssrc/knot/server/server.c
- src/knot/server/tcp-handler.c 2 additions, 2 deletionssrc/knot/server/tcp-handler.c
- src/knot/server/udp-handler.c 2 additions, 2 deletionssrc/knot/server/udp-handler.c
- src/knot/server/zone-load.c 2 additions, 2 deletionssrc/knot/server/zone-load.c
- src/libknot/dnssec/crypto.c 147 additions, 0 deletionssrc/libknot/dnssec/crypto.c
- src/libknot/dnssec/crypto.h 24 additions, 20 deletionssrc/libknot/dnssec/crypto.h
- src/utils/nsec3hash/nsec3hash_main.c 2 additions, 2 deletionssrc/utils/nsec3hash/nsec3hash_main.c
- src/utils/nsupdate/nsupdate_main.c 2 additions, 2 deletionssrc/utils/nsupdate/nsupdate_main.c
- tests-extra/functional/functests.py 1 addition, 1 deletiontests-extra/functional/functests.py
- tests-extra/functional/tests/basic/nsec/test.py 9 additions, 1 deletiontests-extra/functional/tests/basic/nsec/test.py
- tests-extra/functional/tests/basic/nsec3/test.py 9 additions, 1 deletiontests-extra/functional/tests/basic/nsec3/test.py
- tests-extra/functional/tools/dnstest/response.py 13 additions, 1 deletiontests-extra/functional/tools/dnstest/response.py
- tests/dnssec_sign.c 2 additions, 2 deletionstests/dnssec_sign.c
Please register or sign in to comment