Skip to content

Commit

Permalink
Release 0.0.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
James-E-A committed Feb 9, 2024
2 parents 8904cac + b895885 commit 782421f
Show file tree
Hide file tree
Showing 257 changed files with 14,783 additions and 11,201 deletions.
36 changes: 0 additions & 36 deletions .github/workflows/bdist.yaml

This file was deleted.

99 changes: 99 additions & 0 deletions .github/workflows/python_build.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
name: Build

on: [push]

jobs:
sdist:
name: Source build for pip
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v4
- name: install dev requirements
run: python -m pip install -r requirements-dev.txt
- name: build sdist
run: python -m build --sdist && twine check ./dist/*
- name: upload sdist
uses: actions/upload-artifact@v4
with:
name: sdist
path: ./dist/*

bdist:
name: Binary build for ${{ matrix.py-impl }} on ${{ matrix.os }}
needs: sdist
runs-on: ${{ matrix.github_os }}
strategy:
fail-fast: false
matrix:
py-impl: ["CPython 3.X", "PyPy 3.X"]
os: [Windows, Mac, Linux, "Linux (Extra Architectures)"]

include:
- py-impl: "CPython 3.X"
cibw_build: "cp3*"
- py-impl: "PyPy 3.X"
cibw_build: "pp3*"
# Use the oldest OSes available for compatibility
- os: Windows
github_os: windows-2019
cibw_archs: AMD64 x86 ARM64
- os: Mac
github_os: macos-11
cibw_archs: x86_64 arm64 universal2
- os: Linux
github_os: ubuntu-20.04
cibw_archs: x86_64 i686
- os: Linux (Extra Architectures)
github_os: ubuntu-20.04
cibw_archs: aarch64 ppc64le s390x

exclude:
- os: Linux (Extra Architectures)
# FIXME? cibuildwheel disagrees with this
py-impl: "PyPy 3.X"

steps:
- uses: actions/download-artifact@v4
with:
name: sdist
path: ./dist/
- uses: tj-actions/glob@v20
# FIXME? use a more programmatic or integrated solution here
id: sdist_glob
with:
files: ./dist/*

# Used to host cibuildwheel
- uses: actions/setup-python@v3

- if: matrix.os == 'Linux (Extra Architectures)'
uses: docker/setup-qemu-action@v3

- name: Install cibuildwheel
run: python -m pip install cibuildwheel==2.16.3

- name: Build wheels
# https://github.com/pypa/cibuildwheel/issues/173#issuecomment-1501236916
run: python -m cibuildwheel ${{ steps.sdist_glob.outputs.paths }} --output-dir ./dist
env:
CIBW_BUILD: ${{ matrix.cibw_build }}
CIBW_ARCHS: ${{ matrix.cibw_archs }}
CIBW_BUILD_VERBOSITY: 1
# FIXME? cibuildwheel disagrees with CPython 3.6 in some way
# FIXME? PQClean GNU extensions break musl
# FIXME? delvewheel chokes specifically on CPython on Windows on ARM
CIBW_SKIP: >
cp36-*
*-musllinux_*
cp*-win*arm*
# https://cibuildwheel.readthedocs.io/en/stable/options/#:~:text=cibuildwheel%20doesn%27t%20yet%20ship%20a%20default%20repair%20command%20for%20Windows%2E
CIBW_BEFORE_BUILD_WINDOWS: "pip install delvewheel"
CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: "delvewheel repair -w {dest_dir} {wheel}"

- uses: actions/upload-artifact@v4
with:
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
path: ./dist/*.whl
if-no-files-found: error

Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ SOFTWARE.
.endm

.align 4
.global PQCLEAN_KYBER512_AARCH64_f1600x2
.global _PQCLEAN_KYBER512_AARCH64_f1600x2
PQCLEAN_KYBER512_AARCH64_f1600x2:
_PQCLEAN_KYBER512_AARCH64_f1600x2:
.global f1600x2
.global _f1600x2
f1600x2:
_f1600x2:
stp d8, d9, [sp,#-16]!
stp d10, d11, [sp,#-16]!
stp d12, d13, [sp,#-16]!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
* at https://github.com/GMUCERG/PQC_NEON/blob/main/neon/kyber or
* public domain at https://github.com/cothan/kyber/blob/master/neon
*
* We choose
* We offer
* CC0 1.0 Universal or the following MIT License for this file.
* You may freely choose one of them that applies.
*
* MIT License
*
Expand All @@ -32,9 +33,8 @@
* SOFTWARE.
*/

#include <arm_neon.h>
#include <stddef.h>
#include "fips202x2.h"
#include <arm_neon.h>

#define NROUNDS 24

Expand All @@ -47,20 +47,20 @@
#define vxor(c, a, b) c = veorq_u64(a, b);
// Rotate by n bit ((a << offset) ^ (a >> (64-offset)))
#define vROL(out, a, offset) \
(out) = vshlq_n_u64(a, offset); \
(out) = vsriq_n_u64(out, a, 64 - (offset));
out = vshlq_n_u64(a, offset); \
out = vsriq_n_u64(out, a, 64 - offset);
// Xor chain: out = a ^ b ^ c ^ d ^ e
#define vXOR4(out, a, b, c, d, e) \
(out) = veorq_u64(a, b); \
(out) = veorq_u64(out, c); \
(out) = veorq_u64(out, d); \
(out) = veorq_u64(out, e);
out = veorq_u64(a, b); \
out = veorq_u64(out, c); \
out = veorq_u64(out, d); \
out = veorq_u64(out, e);
// Not And c = ~a & b
// #define vbic(c, a, b) c = vbicq_u64(b, a);
// Xor Not And: out = a ^ ( (~b) & c)
#define vXNA(out, a, b, c) \
(out) = vbicq_u64(c, b); \
(out) = veorq_u64(out, a);
out = vbicq_u64(c, b); \
out = veorq_u64(out, a);
// Rotate by 1 bit, then XOR: a ^ ROL(b): SHA1 instruction, not support
#define vrxor(c, a, b) c = vrax1q_u64(a, b);
// End Define
Expand Down Expand Up @@ -100,11 +100,11 @@ static const uint64_t neon_KeccakF_RoundConstants[NROUNDS] = {
*
* Arguments: - uint64_t *state: pointer to input/output Keccak state
**************************************************/
extern void PQCLEAN_KYBER512_AARCH64_f1600x2(v128 *, const uint64_t *);
extern void f1600x2(v128 *, const uint64_t *);
static inline
void KeccakF1600_StatePermutex2(v128 state[25]) {
#if (__APPLE__ && __ARM_FEATURE_CRYPTO) || (__ARM_FEATURE_SHA3) /* although not sure what is being implemented, we find something fast */
PQCLEAN_KYBER512_AARCH64_f1600x2(state, neon_KeccakF_RoundConstants);
f1600x2(state, neon_KeccakF_RoundConstants);
#else
v128 Aba, Abe, Abi, Abo, Abu;
v128 Aga, Age, Agi, Ago, Agu;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
* public domain at https://github.com/cothan/kyber/blob/master/neon
*/

#include "params.h"
#include <arm_neon.h>
#include <stddef.h>
#include <stdint.h>
#include <arm_neon.h>

typedef uint64x2_t v128;

Expand All @@ -23,39 +23,33 @@ typedef struct {
v128 s[25];
} keccakx2_state;

#define shake128x2_absorb KYBER_NAMESPACE(shake128x2_absorb)
void shake128x2_absorb(keccakx2_state *state,
const uint8_t *in0,
const uint8_t *in1,
size_t inlen);

#define shake128x2_squeezeblocks KYBER_NAMESPACE(shake128x2_squeezeblocks)
void shake128x2_squeezeblocks(uint8_t *out0,
uint8_t *out1,
size_t nblocks,
keccakx2_state *state);

#define shake256x2_absorb KYBER_NAMESPACE(shake256x2_absorb)
void shake256x2_absorb(keccakx2_state *state,
const uint8_t *in0,
const uint8_t *in1,
size_t inlen);

#define shake256x2_squeezeblocks KYBER_NAMESPACE(shake256x2_squeezeblocks)
void shake256x2_squeezeblocks(uint8_t *out0,
uint8_t *out1,
size_t nblocks,
keccakx2_state *state);

#define shake128x2 KYBER_NAMESPACE(shake128x2)
void shake128x2(uint8_t *out0,
uint8_t *out1,
size_t outlen,
const uint8_t *in0,
const uint8_t *in1,
size_t inlen);

#define shake256x2 KYBER_NAMESPACE(shake256x2)
void shake256x2(uint8_t *out0,
uint8_t *out1,
size_t outlen,
Expand Down
125 changes: 5 additions & 120 deletions Modules/PQClean/crypto_kem/kyber1024/aarch64/LICENSE
Original file line number Diff line number Diff line change
@@ -1,121 +1,6 @@
Creative Commons Legal Code

CC0 1.0 Universal

CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE
LEGAL SERVICES. DISTRIBUTION OF THIS DOCUMENT DOES NOT CREATE AN
ATTORNEY-CLIENT RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS
INFORMATION ON AN "AS-IS" BASIS. CREATIVE COMMONS MAKES NO WARRANTIES
REGARDING THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS
PROVIDED HEREUNDER, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM
THE USE OF THIS DOCUMENT OR THE INFORMATION OR WORKS PROVIDED
HEREUNDER.

Statement of Purpose

The laws of most jurisdictions throughout the world automatically confer
exclusive Copyright and Related Rights (defined below) upon the creator
and subsequent owner(s) (each and all, an "owner") of an original work of
authorship and/or a database (each, a "Work").

Certain owners wish to permanently relinquish those rights to a Work for
the purpose of contributing to a commons of creative, cultural and
scientific works ("Commons") that the public can reliably and without fear
of later claims of infringement build upon, modify, incorporate in other
works, reuse and redistribute as freely as possible in any form whatsoever
and for any purposes, including without limitation commercial purposes.
These owners may contribute to the Commons to promote the ideal of a free
culture and the further production of creative, cultural and scientific
works, or to gain reputation or greater distribution for their Work in
part through the use and efforts of others.

For these and/or other purposes and motivations, and without any
expectation of additional consideration or compensation, the person
associating CC0 with a Work (the "Affirmer"), to the extent that he or she
is an owner of Copyright and Related Rights in the Work, voluntarily
elects to apply CC0 to the Work and publicly distribute the Work under its
terms, with knowledge of his or her Copyright and Related Rights in the
Work and the meaning and intended legal effect of CC0 on those rights.

1. Copyright and Related Rights. A Work made available under CC0 may be
protected by copyright and related or neighboring rights ("Copyright and
Related Rights"). Copyright and Related Rights include, but are not
limited to, the following:

i. the right to reproduce, adapt, distribute, perform, display,
communicate, and translate a Work;
ii. moral rights retained by the original author(s) and/or performer(s);
iii. publicity and privacy rights pertaining to a person's image or
likeness depicted in a Work;
iv. rights protecting against unfair competition in regards to a Work,
subject to the limitations in paragraph 4(a), below;
v. rights protecting the extraction, dissemination, use and reuse of data
in a Work;
vi. database rights (such as those arising under Directive 96/9/EC of the
European Parliament and of the Council of 11 March 1996 on the legal
protection of databases, and under any national implementation
thereof, including any amended or successor version of such
directive); and
vii. other similar, equivalent or corresponding rights throughout the
world based on applicable law or treaty, and any national
implementations thereof.

2. Waiver. To the greatest extent permitted by, but not in contravention
of, applicable law, Affirmer hereby overtly, fully, permanently,
irrevocably and unconditionally waives, abandons, and surrenders all of
Affirmer's Copyright and Related Rights and associated claims and causes
of action, whether now known or unknown (including existing as well as
future claims and causes of action), in the Work (i) in all territories
worldwide, (ii) for the maximum duration provided by applicable law or
treaty (including future time extensions), (iii) in any current or future
medium and for any number of copies, and (iv) for any purpose whatsoever,
including without limitation commercial, advertising or promotional
purposes (the "Waiver"). Affirmer makes the Waiver for the benefit of each
member of the public at large and to the detriment of Affirmer's heirs and
successors, fully intending that such Waiver shall not be subject to
revocation, rescission, cancellation, termination, or any other legal or
equitable action to disrupt the quiet enjoyment of the Work by the public
as contemplated by Affirmer's express Statement of Purpose.

3. Public License Fallback. Should any part of the Waiver for any reason
be judged legally invalid or ineffective under applicable law, then the
Waiver shall be preserved to the maximum extent permitted taking into
account Affirmer's express Statement of Purpose. In addition, to the
extent the Waiver is so judged Affirmer hereby grants to each affected
person a royalty-free, non transferable, non sublicensable, non exclusive,
irrevocable and unconditional license to exercise Affirmer's Copyright and
Related Rights in the Work (i) in all territories worldwide, (ii) for the
maximum duration provided by applicable law or treaty (including future
time extensions), (iii) in any current or future medium and for any number
of copies, and (iv) for any purpose whatsoever, including without
limitation commercial, advertising or promotional purposes (the
"License"). The License shall be deemed effective as of the date CC0 was
applied by Affirmer to the Work. Should any part of the License for any
reason be judged legally invalid or ineffective under applicable law, such
partial invalidity or ineffectiveness shall not invalidate the remainder
of the License, and in such case Affirmer hereby affirms that he or she
will not (i) exercise any of his or her remaining Copyright and Related
Rights in the Work or (ii) assert any associated claims and causes of
action with respect to the Work, in either case contrary to Affirmer's
express Statement of Purpose.

4. Limitations and Disclaimers.

a. No trademark or patent rights held by Affirmer are waived, abandoned,
surrendered, licensed or otherwise affected by this document.
b. Affirmer offers the Work as-is and makes no representations or
warranties of any kind concerning the Work, express, implied,
statutory or otherwise, including without limitation warranties of
title, merchantability, fitness for a particular purpose, non
infringement, or the absence of latent or other defects, accuracy, or
the present or absence of errors, whether or not discoverable, all to
the greatest extent permissible under applicable law.
c. Affirmer disclaims responsibility for clearing rights of other persons
that may apply to the Work or any use thereof, including without
limitation any person's Copyright and Related Rights in the Work.
Further, Affirmer disclaims responsibility for obtaining any necessary
consents, permissions or other rights required for any use of the
Work.
d. Affirmer understands and acknowledges that Creative Commons is not a
party to this document and has no duty or obligation with respect to
this CC0 or use of the Work.
All the files in this repository are covered by a variety of licenses.
In principle, we offer two choices of licensing:
MIT (https://opensource.org/license/mit/) or CC0 1.0 Universal (https://creativecommons.org/publicdomain/zero/1.0/legalcode.en).
You can find the detailed licensing information in the beginning of each files.
If nothing is stated in the beginning of a file, the file is covered by CC0 1.0 Universal.
Loading

0 comments on commit 782421f

Please sign in to comment.