Skip to content

Commit

Permalink
Merge branch 'release/1.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
heyzooi committed Oct 5, 2018
2 parents 534b552 + f17e45c commit fdcea8d
Show file tree
Hide file tree
Showing 13 changed files with 596 additions and 0 deletions.
5 changes: 5 additions & 0 deletions .cirrus.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
task:
name: macOS
osx_instance:
image: high-sierra-xcode-9.4.1
test_script: make test
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "crypto-algorithms"]
path = crypto-algorithms
url = https://github.com/B-Con/crypto-algorithms.git
16 changes: 16 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "test",
"type": "gdb",
"request": "launch",
"target": "./test",
"cwd": "${workspaceRoot}",
"preLaunchTask": "build test"
}
]
}
19 changes: 19 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
{
"files.associations": {
"stdio.h": "c",
"sqlite-crypto-vfs.h": "c",
"stdlib.h": "c",
"ostream": "cpp",
"__config": "cpp",
"__nullptr": "cpp",
"cstddef": "cpp",
"exception": "cpp",
"initializer_list": "cpp",
"new": "cpp",
"stdexcept": "cpp",
"type_traits": "cpp",
"typeinfo": "cpp",
"algorithm": "cpp"
},
"C_Cpp.default.configurationProvider": "vector-of-bool.cmake-tools",
}
15 changes: 15 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
// See https://go.microsoft.com/fwlink/?LinkId=733558
// for the documentation about the tasks.json format
"version": "2.0.0",
"tasks": [
{
"label": "build test",
"type": "shell",
"command": "make test-build",
"problemMatcher": [
"$gcc"
]
}
]
}
18 changes: 18 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
CC = gcc
CXX = g++
LD = gcc
CFLAGS = $(shell pkg-config --libs sqlite3) $(shell pkg-config --cflags sqlite3)
CXXFLAGS = -g $(CFLAGS) -lsqlite-crypto-vfs -L.

default: build

build: sqlite-crypto-vfs

sqlite-crypto-vfs:
$(CC) $(CFLAGS) -shared -o libsqlite-crypto-vfs.dylib aes.c sqlite-crypto-vfs.c

test-build: sqlite-crypto-vfs
$(CXX) $(CXXFLAGS) -o test test.cpp

test: test-build
DYLD_LIBRARY_PATH=tiny-AES-c ./test
1 change: 1 addition & 0 deletions aes.c
1 change: 1 addition & 0 deletions aes.h
1 change: 1 addition & 0 deletions crypto-algorithms
Submodule crypto-algorithms added at cfbde4
Loading

0 comments on commit fdcea8d

Please sign in to comment.