From: Daniel Salzman Date: Mon, 10 Feb 2020 08:28:44 +0000 (+0100) Subject: base64: fix parameter alignment, update copyright X-Git-Tag: embedded_lmdb~66 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f29d7eaf482d6dfaa84c71428186378d912db265;p=thirdparty%2Fknot-dns.git base64: fix parameter alignment, update copyright --- diff --git a/src/contrib/base64.c b/src/contrib/base64.c index 2d02e1a3e8..ab4a56010d 100644 --- a/src/contrib/base64.c +++ b/src/contrib/base64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -82,9 +82,9 @@ static const uint8_t base64_dec[256] = { }; int32_t knot_base64_encode(const uint8_t *in, - const uint32_t in_len, - uint8_t *out, - const uint32_t out_len) + const uint32_t in_len, + uint8_t *out, + const uint32_t out_len) { // Checking inputs. if (in == NULL || out == NULL) { @@ -130,8 +130,8 @@ int32_t knot_base64_encode(const uint8_t *in, } int32_t knot_base64_encode_alloc(const uint8_t *in, - const uint32_t in_len, - uint8_t **out) + const uint32_t in_len, + uint8_t **out) { // Checking inputs. if (out == NULL) { @@ -161,9 +161,9 @@ int32_t knot_base64_encode_alloc(const uint8_t *in, } int32_t knot_base64_decode(const uint8_t *in, - const uint32_t in_len, - uint8_t *out, - const uint32_t out_len) + const uint32_t in_len, + uint8_t *out, + const uint32_t out_len) { // Checking inputs. if (in == NULL || out == NULL) { @@ -244,8 +244,8 @@ int32_t knot_base64_decode(const uint8_t *in, } int32_t knot_base64_decode_alloc(const uint8_t *in, - const uint32_t in_len, - uint8_t **out) + const uint32_t in_len, + uint8_t **out) { // Checking inputs. if (out == NULL) { diff --git a/src/contrib/base64.h b/src/contrib/base64.h index 844af8843c..0a98733e21 100644 --- a/src/contrib/base64.h +++ b/src/contrib/base64.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -37,9 +37,9 @@ * \retval KNOT_E* if error. */ int32_t knot_base64_encode(const uint8_t *in, - const uint32_t in_len, - uint8_t *out, - const uint32_t out_len); + const uint32_t in_len, + uint8_t *out, + const uint32_t out_len); /*! * \brief Encodes binary data using Base64 and output stores to own buffer. @@ -57,8 +57,8 @@ int32_t knot_base64_encode(const uint8_t *in, * \retval KNOT_E* if error. */ int32_t knot_base64_encode_alloc(const uint8_t *in, - const uint32_t in_len, - uint8_t **out); + const uint32_t in_len, + uint8_t **out); /*! * \brief Decodes text data using Base64. @@ -76,9 +76,9 @@ int32_t knot_base64_encode_alloc(const uint8_t *in, * \retval KNOT_E* if error. */ int32_t knot_base64_decode(const uint8_t *in, - const uint32_t in_len, - uint8_t *out, - const uint32_t out_len); + const uint32_t in_len, + uint8_t *out, + const uint32_t out_len); /*! * \brief Decodes text data using Base64 and output stores to own buffer. @@ -97,7 +97,7 @@ int32_t knot_base64_decode(const uint8_t *in, * \retval KNOT_E* if error. */ int32_t knot_base64_decode_alloc(const uint8_t *in, - const uint32_t in_len, - uint8_t **out); + const uint32_t in_len, + uint8_t **out); /*! @} */ diff --git a/src/libdnssec/binary.c b/src/libdnssec/binary.c index faefa550ea..59153f39e5 100644 --- a/src/libdnssec/binary.c +++ b/src/libdnssec/binary.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2018 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/libknot/rrset-dump.c b/src/libknot/rrset-dump.c index a3ad5622d1..1a457a2f46 100644 --- a/src/libknot/rrset-dump.c +++ b/src/libknot/rrset-dump.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/libknot/yparser/yptrafo.c b/src/libknot/yparser/yptrafo.c index f5452d6ebf..a632055d3b 100644 --- a/src/libknot/yparser/yptrafo.c +++ b/src/libknot/yparser/yptrafo.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/utils/common/tls.c b/src/utils/common/tls.c index 3f2106bd2a..d3e34c947f 100644 --- a/src/utils/common/tls.c +++ b/src/utils/common/tls.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/utils/kdig/kdig_params.c b/src/utils/kdig/kdig_params.c index 7d2987d187..f90c3316d4 100644 --- a/src/utils/kdig/kdig_params.c +++ b/src/utils/kdig/kdig_params.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/src/utils/keymgr/functions.c b/src/utils/keymgr/functions.c index 1477a0d7b7..8f8c8e0ba1 100644 --- a/src/utils/keymgr/functions.c +++ b/src/utils/keymgr/functions.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2019 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/tests/contrib/test_base64.c b/tests/contrib/test_base64.c index 678f9bbec6..82eee7dc97 100644 --- a/tests/contrib/test_base64.c +++ b/tests/contrib/test_base64.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2011 CZ.NIC, z.s.p.o. +/* Copyright (C) 2020 CZ.NIC, z.s.p.o. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by