Skip to content

Commit 85e0565

Browse files
authored
Merge branch 'master' into wp_prep_102_release
2 parents 3c7e7c6 + cc90902 commit 85e0565

File tree

5 files changed

+27
-3
lines changed

5 files changed

+27
-3
lines changed

Makefile.am

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,15 @@ lib_LTLIBRARIES = libwolfprov.la
1616

1717
EXTRA_DIST+=ChangeLog.md
1818
EXTRA_DIST+=README.md
19+
EXTRA_DIST+=IDE
20+
EXTRA_DIST+=examples
1921

2022
include src/include.am
2123
include include/include.am
2224
include test/include.am
2325
include certs/include.am
2426
include scripts/include.am
27+
include examples/include.am
2528

2629
#noinst_PROGRAMS += bench
2730
#bench_SOURCES = bench.c

examples/include.am

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# examples/include.am
2+
#
3+
# Copyright (C) 2006-2023 wolfSSL Inc.
4+
#
5+
# This file is part of wolfProvider.
6+
#
7+
# wolfProvider is free software; you can redistribute it and/or modify
8+
# it under the terms of the GNU General Public License as published by
9+
# the Free Software Foundation; either version 3 of the License, or
10+
# (at your option) any later version.
11+
#
12+
# wolfProvider is distributed in the hope that it will be useful,
13+
# but WITHOUT ANY WARRANTY; without even the implied warranty of
14+
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15+
# GNU General Public License for more details.
16+
#
17+
# You should have received a copy of the GNU General Public License
18+
# along with wolfProvider. If not, see <http://www.gnu.org/licenses/>.
19+
20+
EXTRA_DIST += examples/openssl_example.c

scripts/include.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ dist_noinst_SCRIPTS += scripts/test-wp-cs.sh
44
dist_noinst_SCRIPTS += scripts/utils-openssl.sh
55
dist_noinst_SCRIPTS += scripts/utils-wolfssl.sh
66
dist_noinst_SCRIPTS += scripts/utils-wolfprovider.sh
7+
dist_noinst_SCRIPTS += scripts/utils-general.sh

src/wp_rsa_sig.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,7 @@ static int wp_rsa_sign_x931(wp_RsaSigCtx* ctx, unsigned char* sig,
858858
ok = 0;
859859
}
860860
else if (mp_cmp(&toMp, &nMinusTo) == MP_GT) {
861-
rc = mp_to_unsigned_bin(&nMinusTo, sig);
861+
rc = mp_to_unsigned_bin_len(&nMinusTo, sig, *sigLen);
862862
if (rc != MP_OKAY) {
863863
ok = 0;
864864
}

test/test_ecc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,10 +331,10 @@ int test_eckeygen_name(void *data) {
331331
#endif
332332
#ifdef WP_HAVE_EC_P224
333333
if (err == 0) {
334-
err = test_eckeygen_name_ex("P-192", 0, 0);
334+
err = test_eckeygen_name_ex("P-224", 0, 0);
335335
}
336336
if (err == 0) {
337-
err = test_eckeygen_name_ex("P-192", 1, 0);
337+
err = test_eckeygen_name_ex("P-224", 1, 0);
338338
}
339339
if (err == 0) {
340340
err = test_eckeygen_name_ex(SN_secp224r1, 1, 0);

0 commit comments

Comments
 (0)