Skip to content

Commit

Permalink
Merge branch 'release/v7.0.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
Manuthor committed Oct 26, 2022
2 parents 49660dd + 8f4440d commit 7e72ce8
Show file tree
Hide file tree
Showing 28 changed files with 3,760 additions and 3,036 deletions.
35 changes: 12 additions & 23 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,25 +7,8 @@ variables:
KMS_PUBLIC_PATH: /tmp
KMS_PRIVATE_PATH: /tmp
KMS_SHARED_PATH: /tmp
# Postgres for `cloudproof_js` tests
POSTGRES_DB: app_db
POSTGRES_USER: app_user
POSTGRES_PASSWORD: password
PGPASSWORD: password
PGPORT: 5433
# Postgrest for `cloudproof_js` tests
PGRST_SERVER_HOST: localhost
PGRST_SERVER_PORT: 3000
PGRST_DB_URI: postgres://app_user:password@localhost:${PGPORT}/app_db
PGRST_DB_SCHEMA: public
PGRST_DB_ANON_ROLE: app_user
PGRST_OPENAPI_SERVER_PROXY_URI: http://localhost:3000

services:
- name: postgres
alias: db
- name: postgrest/postgrest
alias: server
- name: gitlab.cosmian.com:5000/core/kms:${KMS_VERSION}_ci
alias: kms_ci
- redis:latest
Expand Down Expand Up @@ -67,6 +50,17 @@ cargo_security_check:
- cargo audit --deny warnings
allow_failure: true

is_publishable:
stage: prebuild
cache: {}
script:
- rm -rf /tmp/${CI_PROJECT_NAME}
- cp -rf . /tmp/${CI_PROJECT_NAME}
- cd /tmp/${CI_PROJECT_NAME}
- cargo publish --dry-run
- rm -rf /tmp/${CI_PROJECT_NAME}
allow_failure: true

#
# Build base
#
Expand Down Expand Up @@ -175,14 +169,11 @@ test_python:
test_cloudproof_js:
image: node:16
stage: test
before_script:
- apt update && apt install -y postgresql libpq-dev
script:
- git clone https://github.com/Cosmian/cloudproof_js.git
- mkdir -p cloudproof_js/tests/wasm_lib/cosmian_${CI_PROJECT_NAME}
- cp -r pkg/nodejs/* cloudproof_js/tests/wasm_lib/cosmian_${CI_PROJECT_NAME}/
- cd cloudproof_js
- psql -h localhost -U "$POSTGRES_USER" -d "$POSTGRES_DB" -f ./dump_db_demo.sql
- npm install jest
- npm test
allow_failure: true
Expand All @@ -196,7 +187,7 @@ pack_all_artifacts:
script:
- zip -r ${CI_PROJECT_NAME}-${CI_COMMIT_TAG}-bin.zip pkg target jniLibs
artifacts:
name: 'cosmian_${CI_PROJECT_NAME}_${CI_COMMIT_TAG}'
name: "cosmian_${CI_PROJECT_NAME}_${CI_COMMIT_TAG}"
paths:
- ${CI_PROJECT_NAME}-${CI_COMMIT_TAG}-bin.zip
expire_in: 3 mos
Expand All @@ -216,8 +207,6 @@ cargo_publish:
stage: publish
rules:
- if: '$CI_COMMIT_TAG =~ /^v\d+.\d+.\d+$/'
before_script:
- apt update && apt install -y git
script:
- echo "[registry]" > ~/.cargo/credentials
- echo "token = \"$CRATES_IO\"" >> ~/.cargo/credentials
Expand Down
29 changes: 28 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,34 @@

All notable changes to this project will be documented in this file.

---

## [7.0.0] - 2022-10-26

### Added

- instantiated types in `statics.rs`
- `Serializable` trait

### Changed

- use `Shake256` to derive keys
- use constant generics instead of `GenericArray`
- make `EncryptedHeader` generic
- make `ClearTextHeader` generic
- use EAKEM (cf [MR](https://github.com/Cosmian/cover_crypt/pull/39))
- `UserSecretKey::x` is now a `HashSet` (`Partition`s are removed)
- `CoverCrypt::encaps()` now takes an `AccessPolicy`
- replace `Hc128` by `ChaCha12Rng` as RNG

### Fixed

### Removed

- `Metadata`

---

---
## [6.0.8] - 2022-10-17

Expand All @@ -14,7 +42,6 @@ All notable changes to this project will be documented in this file.
### Fixed

### Removed

---

---
Expand Down
Loading

0 comments on commit 7e72ce8

Please sign in to comment.