Commit 979d8865 authored by Nils Goroll's avatar Nils Goroll

latest vmodtool requires a rename of _uint32blob to uint32blob

parent 3623bd0c
...@@ -51,7 +51,7 @@ varnish v1 -vcl { ...@@ -51,7 +51,7 @@ varnish v1 -vcl {
} }
set resp.http.a = blob.encode(HEX, UPPER, d2.final()); set resp.http.a = blob.encode(HEX, UPPER, d2.final());
set resp.http.as = blob.encode(HEX, UPPER, set resp.http.as = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key("a", CRC32))); blobdigest.uint32blob(shard.key("a", CRC32)));
if (!d3.update(blob.decode(encoded="b"))) { if (!d3.update(blob.decode(encoded="b"))) {
set resp.status = 500; set resp.status = 500;
...@@ -63,7 +63,7 @@ varnish v1 -vcl { ...@@ -63,7 +63,7 @@ varnish v1 -vcl {
} }
set resp.http.abc = blob.encode(HEX, UPPER, d3.final()); set resp.http.abc = blob.encode(HEX, UPPER, d3.final());
set resp.http.abcs = blob.encode(HEX, UPPER, set resp.http.abcs = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key("abc", CRC32))); blobdigest.uint32blob(shard.key("abc", CRC32)));
if (!d4.update(blob.decode(encoded=" "))) { if (!d4.update(blob.decode(encoded=" "))) {
set resp.status = 500; set resp.status = 500;
...@@ -75,7 +75,7 @@ varnish v1 -vcl { ...@@ -75,7 +75,7 @@ varnish v1 -vcl {
} }
set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final()); set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final());
set resp.http.msgdigests = blob.encode(HEX, UPPER, set resp.http.msgdigests = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key("message digest", CRC32))); blobdigest.uint32blob(shard.key("message digest", CRC32)));
if (!d5.update(blob.decode(encoded=""))) { if (!d5.update(blob.decode(encoded=""))) {
set resp.status = 500; set resp.status = 500;
...@@ -83,7 +83,7 @@ varnish v1 -vcl { ...@@ -83,7 +83,7 @@ varnish v1 -vcl {
} }
set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final()); set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final());
set resp.http.alphalcs = blob.encode(HEX, UPPER, set resp.http.alphalcs = blob.encode(HEX, UPPER,
blobdigest._uint32blob( blobdigest.uint32blob(
shard.key(blob.encode(IDENTITY, blob=alphalc.get()), CRC32))); shard.key(blob.encode(IDENTITY, blob=alphalc.get()), CRC32)));
if (!d7.update(alphalc.get())) { if (!d7.update(alphalc.get())) {
...@@ -96,7 +96,7 @@ varnish v1 -vcl { ...@@ -96,7 +96,7 @@ varnish v1 -vcl {
} }
set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final()); set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final());
set resp.http.alphanums = blob.encode(HEX, UPPER, set resp.http.alphanums = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key( blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=alphauc.get()) + blob.encode(IDENTITY, blob=alphauc.get()) +
blob.encode(IDENTITY, blob=alphalc.get()) + blob.encode(IDENTITY, blob=alphalc.get()) +
"0123456789", CRC32))); "0123456789", CRC32)));
...@@ -131,7 +131,7 @@ varnish v1 -vcl { ...@@ -131,7 +131,7 @@ varnish v1 -vcl {
} }
set resp.http.digits = blob.encode(HEX, UPPER, d8.final()); set resp.http.digits = blob.encode(HEX, UPPER, d8.final());
set resp.http.digitss = blob.encode(HEX, UPPER, set resp.http.digitss = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key( blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=digits.get()) + blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) + blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) + blob.encode(IDENTITY, blob=digits.get()) +
...@@ -143,7 +143,7 @@ varnish v1 -vcl { ...@@ -143,7 +143,7 @@ varnish v1 -vcl {
set resp.http.pangram = blob.encode(HEX, UPPER, d9.final()); set resp.http.pangram = blob.encode(HEX, UPPER, d9.final());
set resp.http.pangrams = blob.encode(HEX, UPPER, set resp.http.pangrams = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key( blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=pangram.get()), CRC32))); blob.encode(IDENTITY, blob=pangram.get()), CRC32)));
# Tests for the hash() function # Tests for the hash() function
......
...@@ -62,7 +62,7 @@ varnish v1 -vcl { ...@@ -62,7 +62,7 @@ varnish v1 -vcl {
} }
set resp.http.a = blob.encode(HEX, UPPER, d2.final()); set resp.http.a = blob.encode(HEX, UPPER, d2.final());
set resp.http.as = blob.encode(HEX, UPPER, set resp.http.as = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key("a", RS))); blobdigest.uint32blob(shard.key("a", RS)));
if (!d3.update(blob.decode(encoded="b"))) { if (!d3.update(blob.decode(encoded="b"))) {
set resp.status = 500; set resp.status = 500;
...@@ -74,7 +74,7 @@ varnish v1 -vcl { ...@@ -74,7 +74,7 @@ varnish v1 -vcl {
} }
set resp.http.abc = blob.encode(HEX, UPPER, d3.final()); set resp.http.abc = blob.encode(HEX, UPPER, d3.final());
set resp.http.abcs = blob.encode(HEX, UPPER, set resp.http.abcs = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key("abc", RS))); blobdigest.uint32blob(shard.key("abc", RS)));
if (!d4.update(blob.decode(encoded=" "))) { if (!d4.update(blob.decode(encoded=" "))) {
set resp.status = 500; set resp.status = 500;
...@@ -86,7 +86,7 @@ varnish v1 -vcl { ...@@ -86,7 +86,7 @@ varnish v1 -vcl {
} }
set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final()); set resp.http.msgdigest = blob.encode(HEX, UPPER, d4.final());
set resp.http.msgdigests = blob.encode(HEX, UPPER, set resp.http.msgdigests = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key("message digest", RS))); blobdigest.uint32blob(shard.key("message digest", RS)));
if (!d5.update(blob.decode(encoded=""))) { if (!d5.update(blob.decode(encoded=""))) {
set resp.status = 500; set resp.status = 500;
...@@ -94,7 +94,7 @@ varnish v1 -vcl { ...@@ -94,7 +94,7 @@ varnish v1 -vcl {
} }
set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final()); set resp.http.alphalc = blob.encode(HEX, UPPER, d5.final());
set resp.http.alphalcs = blob.encode(HEX, UPPER, set resp.http.alphalcs = blob.encode(HEX, UPPER,
blobdigest._uint32blob( blobdigest.uint32blob(
shard.key(blob.encode(IDENTITY, blob=alphalc.get()), RS))); shard.key(blob.encode(IDENTITY, blob=alphalc.get()), RS)));
if (!d7.update(alphalc.get())) { if (!d7.update(alphalc.get())) {
...@@ -107,7 +107,7 @@ varnish v1 -vcl { ...@@ -107,7 +107,7 @@ varnish v1 -vcl {
} }
set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final()); set resp.http.alphanum = blob.encode(HEX, UPPER, d7.final());
set resp.http.alphanums = blob.encode(HEX, UPPER, set resp.http.alphanums = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key( blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=alphauc.get()) + blob.encode(IDENTITY, blob=alphauc.get()) +
blob.encode(IDENTITY, blob=alphalc.get()) + blob.encode(IDENTITY, blob=alphalc.get()) +
"0123456789", RS))); "0123456789", RS)));
...@@ -142,7 +142,7 @@ varnish v1 -vcl { ...@@ -142,7 +142,7 @@ varnish v1 -vcl {
} }
set resp.http.digits = blob.encode(HEX, UPPER, d8.final()); set resp.http.digits = blob.encode(HEX, UPPER, d8.final());
set resp.http.digitss = blob.encode(HEX, UPPER, set resp.http.digitss = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key( blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=digits.get()) + blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) + blob.encode(IDENTITY, blob=digits.get()) +
blob.encode(IDENTITY, blob=digits.get()) + blob.encode(IDENTITY, blob=digits.get()) +
...@@ -154,7 +154,7 @@ varnish v1 -vcl { ...@@ -154,7 +154,7 @@ varnish v1 -vcl {
set resp.http.pangram = blob.encode(HEX, UPPER, d9.final()); set resp.http.pangram = blob.encode(HEX, UPPER, d9.final());
set resp.http.pangrams = blob.encode(HEX, UPPER, set resp.http.pangrams = blob.encode(HEX, UPPER,
blobdigest._uint32blob(shard.key( blobdigest.uint32blob(shard.key(
blob.encode(IDENTITY, blob=pangram.get()), RS))); blob.encode(IDENTITY, blob=pangram.get()), RS)));
if (!d11.update(b64to127.get())) { if (!d11.update(b64to127.get())) {
......
...@@ -638,7 +638,7 @@ vbe32enc(void *pp, uint32_t u) ...@@ -638,7 +638,7 @@ vbe32enc(void *pp, uint32_t u)
} }
VCL_BLOB VCL_BLOB
vmod__uint32blob(VRT_CTX, VCL_INT i) vmod_uint32blob(VRT_CTX, VCL_INT i)
{ {
uint32_t ui = (uint32_t)i; uint32_t ui = (uint32_t)i;
uint8_t be[sizeof ui]; uint8_t be[sizeof ui];
......
...@@ -448,7 +448,7 @@ Example:: ...@@ -448,7 +448,7 @@ Example::
std.log("Using VMOD blobdigest version " + blobdigest.version()); std.log("Using VMOD blobdigest version " + blobdigest.version());
$Function BLOB _uint32blob(INT) $Function BLOB uint32blob(INT)
Intentionally undocumented, transitional helper only Intentionally undocumented, transitional helper only
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment