Skip to content

Commit

Permalink
add IBM Research attribution; limit Win-testing to mb-* branches (ope…
Browse files Browse the repository at this point in the history
  • Loading branch information
baentsch authored Apr 9, 2020
1 parent 7419141 commit a00781c
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 3 deletions.
12 changes: 10 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,16 @@ workflows:
version: 2
build:
jobs:
- win-shared
- win-static:
filters:
branches:
only:
- /mb-.*/
- win-shared:
filters:
branches:
only:
- /mb-.*/
- centos-7-amd64
- centos-8-amd64
- debian-buster-amd64
Expand All @@ -235,7 +244,6 @@ workflows:
- debian-buster-armhf
- debian-buster-armel
- macOS
- win-static
- ubuntu-bionic-x86_64-gcc7
- ubuntu-bionic-x86_64-gcc7-noopenssl
- ubuntu-bionic-x86_64-gcc7-shared
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ liboqs includes some third party libraries or modules that are licensed differen

## Acknowledgements

Various companies, including Amazon Web Services, evolutionQ, Microsoft Research, and Cisco Systems, have dedicated programmer time to contribute source code to OQS. [Various people](CONTRIBUTORS) have contributed source code to liboqs.
Various companies, including Amazon Web Services, evolutionQ, Microsoft Research, Cisco Systems, and IBM Research have dedicated programmer time to contribute source code to OQS. [Various people](CONTRIBUTORS) have contributed source code to liboqs.

Financial support for the development of Open Quantum Safe has been provided by Amazon Web Services and the Tutte Institute for Mathematics and Computing.
Research projects which developed specific components of OQS have been supported by various research grants, including funding from the Natural Sciences and Engineering Research Council of Canada (NSERC); see the source papers for funding acknowledgments.

0 comments on commit a00781c

Please sign in to comment.