-# $OpenBSD: Makefile,v 1.3 2019/04/24 20:25:19 bluhm Exp $
+# $OpenBSD: Makefile,v 1.4 2022/07/07 20:01:20 tb Exp $
-.if ! (make(clean) || make(cleandir) || make(obj))
-GO_VERSION != sh -c "(go version) 2>/dev/null || true"
-.endif
+WYCHEPROOF_TESTVECTORS = /usr/local/share/wycheproof/testvectors/
-.if empty(GO_VERSION)
+.if !exists(${WYCHEPROOF_TESTVECTORS})
regress:
- @echo package go is required for this regress
+ @echo package wycheproof-testvectors is required for this regress
+ @echo package go should be installed if available
@echo SKIPPED
-.endif
+.else
+
+# REGRESS_TARGETS += regress-wycheproof-primes
+
+. if exists(/usr/local/bin/go)
-CLEANFILES+=wycheproof
-REGRESS_TARGETS=regress-wycheproof
+REGRESS_TARGETS += regress-wycheproof
+
+CLEANFILES += wycheproof
audit: wycheproof
./wycheproof -v
.PHONY: audit
+. endif
+
+PROGS += wycheproof-primes
+
+LDADD = -lcrypto
+DPADD = ${LIBCRYPTO}
+CFLAGS = -I${.CURDIR} -I${.OBJDIR}
+
+primality_testcases.h: wycheproof-json.pl ${WYCHEPROOF_TESTVECTORS}/primality_test.json
+ perl ${.CURDIR}/wycheproof-json.pl > $@.tmp
+ mv -f $@.tmp $@
+
+wycheproof-primes: wycheproof-primes.c primality_testcases.h
+
+regress-wycheproof-primes: primality_testcases.h wycheproof-primes
+ ./wycheproof-primes
+
+CLEANFILES += primality_testcases.h
+
+.endif
+
.include <bsd.regress.mk>
--- /dev/null
+# $OpenBSD: wycheproof-json.pl,v 1.1 2022/07/07 20:01:20 tb Exp $
+
+# Copyright (c) 2022 Joel Sing <jsing@openbsd.org>
+# Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+use JSON::PP;
+
+$test_vector_path = "/usr/local/share/wycheproof/testvectors";
+
+open JSON, "$test_vector_path/primality_test.json" or die;
+@json = <JSON>;
+close JSON;
+
+$tv = JSON::PP::decode_json(join "\n", @json);
+$test_groups = %$tv{"testGroups"};
+
+my $wycheproof_struct = <<"EOL";
+struct wycheproof_testcase {
+ int id;
+ const char *value;
+ int acceptable;
+ int result;
+};
+
+struct wycheproof_testcase testcases[] = {
+EOL
+
+print $wycheproof_struct;
+
+foreach $test_group (@$test_groups) {
+ $test_group_type = %$test_group{"type"};
+ $test_group_tests = %$test_group{"tests"};
+
+ foreach $test_case (@$test_group_tests) {
+ %tc = %$test_case;
+
+ $tc_id = $tc{"tcId"};
+ $tc_value = $tc{"value"};
+ $tc_result = $tc{"result"};
+ $tc_flags = @{$tc{"flags"}};
+
+ my $result = $tc_result eq "valid" ? 1 : 0;
+
+ print "\t{\n";
+ print "\t\t.id = $tc_id,\n";
+ print "\t\t.value = \"$tc_value\",\n";
+ print "\t\t.result = $result,\n";
+
+ if ($tc_result eq "acceptable") {
+ print "\t\t.acceptable = 1,\n";
+ }
+
+ print "\t},\n";
+ }
+}
+
+print "};\n\n";
+
+print "#define N_TESTS (sizeof(testcases) / sizeof(testcases[0]))\n"
--- /dev/null
+/* $OpenBSD: wycheproof-primes.c,v 1.1 2022/07/07 20:01:20 tb Exp $ */
+/*
+ * Copyright (c) 2022 Theo Buehler <tb@openbsd.org>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <err.h>
+#include <stdio.h>
+
+#include <openssl/bn.h>
+
+#include "primality_testcases.h"
+
+int
+primality_test(struct wycheproof_testcase *test)
+{
+ BIGNUM *value = NULL;
+ int ret;
+ int failed = 1;
+
+ if (!BN_hex2bn(&value, test->value))
+ errx(1, "%d: failed to set value \"%s\"", test->id, test->value);
+
+ if ((ret = BN_is_prime_ex(value, BN_prime_checks, NULL, NULL)) < 0)
+ errx(1, "%d: BN_is_prime_ex errored", test->id);
+
+ if (ret != test->result && !test->acceptable) {
+ fprintf(stderr, "%d failed, want %d, got %d\n", test->id,
+ test->result, ret);
+ goto err;
+ }
+
+ failed = 0;
+ err:
+ BN_free(value);
+
+ return failed;
+}
+
+int
+main(void)
+{
+ size_t i;
+ int failed = 0;
+
+ for (i = 0; i < N_TESTS; i++)
+ failed |= primality_test(&testcases[i]);
+
+ printf("%s\n", failed ? "FAILED" : "SUCCESS");
+
+ return failed;
+}
-/* $OpenBSD: wycheproof.go,v 1.126 2022/05/05 18:34:27 tb Exp $ */
+/* $OpenBSD: wycheproof.go,v 1.127 2022/07/07 20:01:20 tb Exp $ */
/*
* Copyright (c) 2018 Joel Sing <jsing@openbsd.org>
* Copyright (c) 2018,2019,2022 Theo Buehler <tb@openbsd.org>
Tests []*wycheproofTestKW `json:"tests"`
}
+type wycheproofTestPrimality struct {
+ TCID int `json:"tcId"`
+ Comment string `json:"comment"`
+ Value string `json:"value"`
+ Result string `json:"result"`
+ Flags []string `json:"flags"`
+}
+
+type wycheproofTestGroupPrimality struct {
+ Type string `json:"type"`
+ Tests []*wycheproofTestPrimality `json:"tests"`
+}
+
type wycheproofTestRSA struct {
TCID int `json:"tcId"`
Comment string `json:"comment"`
return success
}
+func runPrimalityTest(wt *wycheproofTestPrimality) bool {
+ var bnValue *C.BIGNUM
+ value := C.CString(wt.Value)
+ if C.BN_hex2bn(&bnValue, value) == 0 {
+ log.Fatal("Failed to set bnValue")
+ }
+ C.free(unsafe.Pointer(value))
+ defer C.BN_free(bnValue)
+
+ ret := C.BN_is_prime_ex(bnValue, C.BN_prime_checks, (*C.BN_CTX)(unsafe.Pointer(nil)), (*C.BN_GENCB)(unsafe.Pointer(nil)))
+ success := wt.Result == "acceptable" || (ret == 0 && wt.Result == "invalid") || (ret == 1 && wt.Result == "valid")
+ if !success {
+ fmt.Printf("FAIL: Test case %d (%q) %v failed - got %d, want %v\n", wt.TCID, wt.Comment, wt.Flags, ret, wt.Result)
+ }
+ return success
+}
+
+func runPrimalityTestGroup(algorithm string, wtg *wycheproofTestGroupPrimality) bool {
+ fmt.Printf("Running %v test group...\n", algorithm)
+
+ success := true
+ for _, wt := range wtg.Tests {
+ if !runPrimalityTest(wt) {
+ success = false
+ }
+ }
+ return success
+}
+
func runRsaesOaepTest(rsa *C.RSA, sha *C.EVP_MD, mgfSha *C.EVP_MD, wt *wycheproofTestRsaes) bool {
ct, err := hex.DecodeString(wt.CT)
if err != nil {
wtg = &wycheproofTestGroupHmac{}
case "KW":
wtg = &wycheproofTestGroupKW{}
+ case "PrimalityTest":
+ wtg = &wycheproofTestGroupPrimality{}
case "RSAES-OAEP":
wtg = &wycheproofTestGroupRsaesOaep{}
case "RSAES-PKCS1-v1_5":
if !runKWTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupKW)) {
success = false
}
+ case "PrimalityTest":
+ if !runPrimalityTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupPrimality)) {
+ success = false
+ }
case "RSAES-OAEP":
if !runRsaesOaepTestGroup(wtv.Algorithm, wtg.(*wycheproofTestGroupRsaesOaep)) {
success = false
{"HKDF", "hkdf_sha*_test.json", Normal},
{"HMAC", "hmac_sha*_test.json", Normal},
{"KW", "kw_test.json", Normal},
+ {"Primality test", "primality_test.json", Skip}, // XXX
{"RSA", "rsa_*test.json", Normal},
{"X25519", "x25519_test.json", Normal},
{"X25519 ASN", "x25519_asn_test.json", Skip},
projects / openbsd / commitdiff