This repository was archived by the owner on Jan 8, 2025. It is now read-only.

Merge instructions

Jump to bottom

Douglas Stebila edited this page Aug 28, 2017 · 11 revisions

To sync this fork with the upstream OpenSSL repository:

git clone --branch OpenSSL_1_0_2-stable https://github.com/open-quantum-safe/openssl.git
git remote add openssl https://github.com/openssl/openssl.git
git fetch openssl
git merge openssl/OpenSSL_1_0_2-stable
Test the merged source code (configure, build, test)
Sync the local repository with GitHub

To sync this repository's liboqs subtree with the main repository: (see https://developer.atlassian.com/blog/2015/05/the-power-of-git-subtree/)

git subtree pull --prefix vendor/liboqs https://github.com/open-quantum-safe/liboqs.git master --squash