Commit 4dd7869b authored by Thomas Haller's avatar Thomas Haller

Squashed 'shared/c-siphash/' changes from 24e301e329..211cfc5abc

211cfc5abc fix spelling in API documentation and code comment
b24d2e2048 build: only run full matrix on default CI
8f1fdb72a0 build: update build system

git-subtree-dir: shared/c-siphash
git-subtree-split: 211cfc5abc3813cddd10d237ba9d843b8d3a8995
parent 1ea09eb5
os: linux
dist: trusty
language: c
- docker
......@@ -12,6 +16,6 @@ jobs:
- ./vmrun -- ../src/cherryci -d ../src/.cherryci -s c-util -m
- script:
- ./vmrun -T armv7hl -- ../src/cherryci -d ../src/.cherryci -s c-util -m
- ./vmrun -T armv7hl -- ../src/cherryci -d ../src/.cherryci -s c-util
- script:
- ./vmrun -T i686 -- ../src/cherryci -d ../src/.cherryci -s c-util -m
- ./vmrun -T i686 -- ../src/cherryci -d ../src/.cherryci -s c-util
This diff is collapsed.
\ No newline at end of file
......@@ -37,9 +37,9 @@ REQUIREMENTS:
pkg-config >= 0.29
The meson build-system is used for c-siphash. Contact upstream
The meson build-system is used for this project. Contact upstream
documentation for detailed help. In most situations the following
commands are sufficient to build and install c-siphash from source:
commands are sufficient to build and install from source:
$ mkdir build
$ cd build
......@@ -5,8 +5,9 @@ project(
license: 'Apache',
default_options: [
project_description = 'Streaming-capable SipHash Implementation'
add_project_arguments('-D_GNU_SOURCE', language: 'c')
mod_pkgconfig = import('pkgconfig')
......@@ -55,7 +55,7 @@ static inline void c_siphash_sipround(CSipHash *state) {
* @seed: 128bit seed
* This initializes the siphash state context. Once initialized, it can be used
* to hash arbitary input. To feed data into it, use c_siphash_append(). To get
* to hash arbitrary input. To feed data into it, use c_siphash_append(). To get
* the final hash, use c_siphash_finalize().
* Note that the siphash context does not allocate state. There is no need to
......@@ -134,7 +134,7 @@ _public_ void c_siphash_append(CSipHash *state, const uint8_t *bytes, size_t n_b
end -= (state->n_bytes % sizeof(uint64_t));
* We are now guaranteed to be at a 64bit state boudary. Hence, we can
* We are now guaranteed to be at a 64bit state boundary. Hence, we can
* operate in 64bit chunks on all input. This is much faster than the
* one-byte-at-a-time loop.
......@@ -31,7 +31,7 @@ libcsiphash_shared = shared_library(
libcsiphash_dep = declare_dependency(
include_directories: include_directories('.'),
link_with: libcsiphash_private,
version: meson.project_version()
version: meson.project_version(),
if not meson.is_subproject()
......@@ -42,7 +42,7 @@ if not meson.is_subproject()
version: meson.project_version(),
name: 'libcsiphash',
filebase: 'libcsiphash',
description: 'Streaming-capable SipHash Implementation',
description: project_description,
......@@ -53,5 +53,5 @@ endif
test_api = executable('test-api', ['test-api.c'], link_with: libcsiphash_shared)
test('API Symbol Visibility', test_api)
test_basic = executable('test-basic', ['test-basic.c'], link_with: libcsiphash_private)
test_basic = executable('test-basic', ['test-basic.c'], dependencies: libcsiphash_dep)
test('Basic API Behavior', test_basic)
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment