51fa068f50
libvuptsdk (git.securityops.co/cristiancmoises/libvuptsdk) is the renamed libzuptsdk: only the .so filename/SONAME changed (libzuptsdk.so.2 -> libvuptsdk.so.2); the C API (zuptsdk_* symbols, zuptsdk.h) is unchanged. - Rename vendor/zuptsdk -> vendor/vuptsdk with libvuptsdk's headers. - Makefile WITH_SDK=1 now links -lvuptsdk (+ its transitive libcrypto/libargon2 deps via SDK_DEPLIBS) instead of -lzuptsdk, and installs libvuptsdk.so.*. - DECOUPLE --pq-box: it needs the SEPARATE libpqvaptvupt, which libvuptsdk does NOT provide, so gate it behind a new WITH_PQBOX=1 (was folded into WITH_SDK). zupt_crypto_pqbox.c now keys on ZUPT_WITH_PQBOX; WITH_SDK=1 alone builds and links cleanly with just libvuptsdk and enables --pq-sdk + Argon2id. - Banner/help renamed libzuptsdk -> libvuptsdk; the machine-readable 'Build:' line lists --pq-box only under WITH_PQBOX. GUI _get_caps matches on 'vuptsdk'. Validated on Guix: WITH_SDK=1 links libvuptsdk + libcrypto + libargon2, runs, banner 'Build: full (libvuptsdk: Argon2id, --pq-sdk available)', keygen --sdk + --pq-sdk encrypt/decrypt byte-exact roundtrip. Default source-only build unchanged (make check 16/16).
145 lines
5.8 KiB
C
145 lines
5.8 KiB
C
/*
|
||
* SPDX-License-Identifier: AGPL-3.0-or-later
|
||
*
|
||
* VaptVupt — tANS Entropy Codec (v2: sparse header + 4-way interleaved)
|
||
*
|
||
* Standalone: define VV_ANS_STANDALONE to use without VaptVupt.
|
||
* ZUPT-COMPAT: this header has zero VaptVupt dependencies when standalone.
|
||
*
|
||
* v0.6 changes:
|
||
* - Adaptive sparse/dense header (Item 1): 3× smaller on typical data
|
||
* - 4-way interleaved encode/decode (Item 2): ~2.5× faster decode
|
||
*/
|
||
#ifndef VV_ANS_H
|
||
#define VV_ANS_H
|
||
|
||
#include <stdint.h>
|
||
#include <stddef.h>
|
||
|
||
#ifdef __cplusplus
|
||
extern "C" {
|
||
#endif
|
||
|
||
#define VVA_TABLE_LOG 12
|
||
#define VVA_TABLE_SIZE (1 << VVA_TABLE_LOG) /* 4096 */
|
||
#define VVA_MAX_SYMBOL 256
|
||
|
||
/* Header format discriminators */
|
||
#define VVA_HDR_SINGLE 0x01 /* Single symbol: 0-bit encoding */
|
||
#define VVA_HDR_SPARSE 0x02 /* ≤32 active symbols: (sym,freq) pairs */
|
||
#define VVA_HDR_DENSE 0x03 /* >32 active symbols: max_sym + freq array */
|
||
/* ZUPT-COMPAT: v0.5 legacy format detected by first byte being 0x00-0xFF
|
||
* without matching any HDR_* code — fall back to old read path. */
|
||
#define VVA_HDR_LEGACY 0x00 /* v0.5 format: [max_sym] [2B×(max_sym+1)] */
|
||
|
||
#ifdef VV_ANS_STANDALONE
|
||
typedef enum {
|
||
VVA_OK = 0,
|
||
VVA_ERR_IO = -1,
|
||
VVA_ERR_CORRUPT = -2,
|
||
VVA_ERR_NOMEM = -3,
|
||
VVA_ERR_OVERFLOW = -4,
|
||
VVA_ERR_PARAM = -6,
|
||
} vva_error_t;
|
||
#else
|
||
#include "vaptvupt.h"
|
||
typedef vv_error_t vva_error_t;
|
||
#define VVA_OK VV_OK
|
||
#define VVA_ERR_CORRUPT VV_ERR_CORRUPT
|
||
#define VVA_ERR_NOMEM VV_ERR_NOMEM
|
||
#define VVA_ERR_OVERFLOW VV_ERR_OVERFLOW
|
||
#define VVA_ERR_PARAM VV_ERR_PARAM
|
||
#endif
|
||
|
||
typedef struct {
|
||
uint8_t symbol;
|
||
uint8_t nbits;
|
||
uint16_t baseline;
|
||
} vva_dec_entry_t;
|
||
|
||
/* ═══ Public API ═══ */
|
||
|
||
/* Single-stream encode/decode (tag 'A', backward compat with v0.5) */
|
||
vva_error_t vva_encode(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len);
|
||
|
||
vva_error_t vva_decode(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap,
|
||
size_t num_literals, size_t *src_consumed);
|
||
|
||
/* 4-way interleaved encode/decode (tag 'I', v0.6+) */
|
||
vva_error_t vva_encode4(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len);
|
||
|
||
vva_error_t vva_decode4(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap,
|
||
size_t num_literals, size_t *src_consumed);
|
||
|
||
/* Order-1 context model encode/decode (tag 'C', v0.7+)
|
||
* Uses 256 ANS tables — one per previous byte. Contexts with too few
|
||
* observations inherit from the global table. 4 MB decode memory. */
|
||
vva_error_t vva_encode_ctx(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len);
|
||
|
||
vva_error_t vva_decode_ctx(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap,
|
||
size_t num_literals, size_t *src_consumed);
|
||
|
||
/* ═══ Sequence coding (tag 'S', v0.8+) ═══
|
||
* ZUPT-COMPAT: available when VV_ANS_STANDALONE is defined.
|
||
*
|
||
* Encodes an LZ token stream using 3 ANS tables: literals, match-length
|
||
* codes (36 symbols), and offset codes (24 symbols). Replaces raw varint
|
||
* storage of match metadata, saving 8-15% on typical data.
|
||
*
|
||
* Input token format (from LZ engine):
|
||
* [token: litlen:4|matchlen:4] [litlen_ext] [literal_bytes] [2B offset LE] [matchlen_ext]
|
||
* Output: [3 table headers] [4B seq_count] [4B lit_count] [ANS bitstream]
|
||
*/
|
||
|
||
#define VVA_ML_CODES 36 /* Match length code count */
|
||
#define VVA_OF_CODES 27 /* Offset code count: 3 rep + 24 explicit */
|
||
#define VVA_LL_CODES 36 /* Literal-run length code count (covers 0-65536+) */
|
||
|
||
vva_error_t vva_encode_sequences(const uint8_t *tokens, size_t tok_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len,
|
||
int off_bytes);
|
||
|
||
/* Format-v2 variant: encodes match-length codes using ml_base_v2
|
||
* (min_match=3). Used for 'T' tag blocks. Added v2.34.0. */
|
||
vva_error_t vva_encode_sequences_v2(const uint8_t *tokens, size_t tok_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len,
|
||
int off_bytes);
|
||
|
||
/* Sprint 105 Phase C: variants accepting disable_huf4 flag.
|
||
* disable_huf4=1 suppresses lit_fmt=4 (4-stream Huffman) selection
|
||
* for v2.46.5 and older decoder compatibility. */
|
||
vva_error_t vva_encode_sequences_compat(const uint8_t *tokens, size_t tok_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len,
|
||
int off_bytes, int disable_huf4);
|
||
vva_error_t vva_encode_sequences_v2_compat(const uint8_t *tokens, size_t tok_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len,
|
||
int off_bytes, int disable_huf4);
|
||
|
||
vva_error_t vva_decode_sequences(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len,
|
||
const uint8_t *dst_base);
|
||
|
||
/* Format-v2 variant: same wire payload as vva_decode_sequences but
|
||
* interprets match-length codes with a table shifted down by 1
|
||
* (min_match=3 instead of 4). Produced by tag 'T' (VV_ENTROPY_SEQ_V2)
|
||
* blocks; closes the ~10% binary-compression gap vs gzip-9. Added
|
||
* v2.33.0. */
|
||
vva_error_t vva_decode_sequences_v2(const uint8_t *src, size_t src_len,
|
||
uint8_t *dst, size_t dst_cap, size_t *dst_len,
|
||
const uint8_t *dst_base);
|
||
|
||
static inline size_t vva_bound(size_t src_len) {
|
||
/* Context model header can be up to ~10KB, seq coding adds 3 table headers */
|
||
return 12288 + (src_len * 15 + 7) / 8 + 16;
|
||
}
|
||
|
||
#ifdef __cplusplus
|
||
}
|
||
#endif
|
||
#endif /* VV_ANS_H */
|