[openssl-commits] Build completed: openssl master.20209
Build openssl master.20209 completed Commit 25268f9151 by Shane Lontis on 10/5/2018 12:05 AM: Updated RSA keygen and validation with newer SP800-56B + prime recovery code added Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl master.20208
Build openssl master.20208 failed Commit 76e136e0ff by Pauli on 10/4/2018 11:19 PM: RSA security bits calculation Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build completed: openssl master.20202
Build openssl master.20202 completed Commit 02819b6ea7 by Richard Levitte on 10/4/2018 7:31 PM: fixup! Add build file support for generic symbol exports with DSOs Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl master.20201
Build openssl master.20201 failed Commit e2b85d2be2 by Richard Levitte on 10/4/2018 7:00 PM: fixup! Add build file support for generic symbol exports with DSOs Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl master.20200
Build openssl master.20200 failed Commit a136db5e54 by Richard Levitte on 10/4/2018 5:17 PM: fixup! Add build file support for generic symbol exports with DSOs Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] Build failed: openssl master.20199
Build openssl master.20199 failed Commit 56d862517b by Richard Levitte on 10/4/2018 3:41 PM: Configure: use correct variable to infer the .ld file location Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] OpenSSL_1_1_1-stable update
The branch OpenSSL_1_1_1-stable has been updated via c11c28052f333ca2fdd921c7f356eebf98b8421a (commit) via 90893527fc72189b17f1319aa735ecd5762aa7ca (commit) from 236119c48ecaac933fc52d7cbfd8d9214d216122 (commit) - Log - commit c11c28052f333ca2fdd921c7f356eebf98b8421a Author: Matt Caswell Date: Wed Oct 3 15:29:47 2018 +0100 Extend the BIO callback tests to check the return value semantics Check that different return values passed to the BIO callback are correctly handled. Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/7344) (cherry picked from commit 52d78cc5ebc1d4fc021cabbcb09f4efb4c6ae82d) commit 90893527fc72189b17f1319aa735ecd5762aa7ca Author: Matt Caswell Date: Wed Oct 3 15:27:31 2018 +0100 Fix the BIO callback return code handling The BIO callback handling incorrectly wrote over the return code passed to the callback, meaning that an incorrect result was (eventually) returned to the caller. Fixes #7343 Reviewed-by: Tim Hudson (Merged from https://github.com/openssl/openssl/pull/7344) (cherry picked from commit d97ce8d9a0619c1d9d1222dc1b44dbebb58dd966) --- Summary of changes: crypto/bio/bio_lib.c | 4 +- test/bio_callback_test.c | 117 +++ 2 files changed, 91 insertions(+), 30 deletions(-) diff --git a/crypto/bio/bio_lib.c b/crypto/bio/bio_lib.c index 95eef7d..ca375b9 100644 --- a/crypto/bio/bio_lib.c +++ b/crypto/bio/bio_lib.c @@ -52,7 +52,7 @@ static long bio_call_callback(BIO *b, int oper, const char *argp, size_t len, argi = (int)len; } -if (inret && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) { +if (inret > 0 && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) { if (*processed > INT_MAX) return -1; inret = *processed; @@ -60,7 +60,7 @@ static long bio_call_callback(BIO *b, int oper, const char *argp, size_t len, ret = b->callback(b, oper, argp, argi, argl, inret); -if (ret >= 0 && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) { +if (ret > 0 && (oper & BIO_CB_RETURN) && bareoper != BIO_CB_CTRL) { *processed = (size_t)ret; ret = 1; } diff --git a/test/bio_callback_test.c b/test/bio_callback_test.c index f1712b3..8a17602 100644 --- a/test/bio_callback_test.c +++ b/test/bio_callback_test.c @@ -41,8 +41,11 @@ static int test_bio_callback(void) int ok = 0; BIO *bio; int i; -char *test1 = "test"; -char *test2 = "hello"; +char test1[] = "test"; +const int test1len = sizeof(test1) - 1; +char test2[] = "hello"; +const int test2len = sizeof(test2) - 1; +char buf[16]; my_param_count = 0; @@ -51,50 +54,108 @@ static int test_bio_callback(void) goto err; BIO_set_callback(bio, my_bio_callback); -i = BIO_write(bio, test1, 4); -if (!TEST_int_eq(i, 4) +i = BIO_write(bio, test1, test1len); +if (!TEST_int_eq(i, test1len) || !TEST_int_eq(my_param_count, 2) || !TEST_ptr_eq(my_param_b[0], bio) || !TEST_int_eq(my_param_oper[0], BIO_CB_WRITE) || !TEST_ptr_eq(my_param_argp[0], test1) -|| !TEST_int_eq(my_param_argi[0], 4) +|| !TEST_int_eq(my_param_argi[0], test1len) || !TEST_long_eq(my_param_argl[0], 0L) || !TEST_long_eq(my_param_ret[0], 1L) || !TEST_ptr_eq(my_param_b[1], bio) || !TEST_int_eq(my_param_oper[1], BIO_CB_WRITE | BIO_CB_RETURN) || !TEST_ptr_eq(my_param_argp[1], test1) -|| !TEST_int_eq(my_param_argi[1], 4) +|| !TEST_int_eq(my_param_argi[1], test1len) || !TEST_long_eq(my_param_argl[1], 0L) -|| !TEST_long_eq(my_param_ret[1], 4L)) +|| !TEST_long_eq(my_param_ret[1], (long)test1len)) goto err; +my_param_count = 0; +i = BIO_read(bio, buf, sizeof(buf)); +if (!TEST_mem_eq(buf, i, test1, test1len) +|| !TEST_int_eq(my_param_count, 2) +|| !TEST_ptr_eq(my_param_b[0], bio) +|| !TEST_int_eq(my_param_oper[0], BIO_CB_READ) +|| !TEST_ptr_eq(my_param_argp[0], buf) +|| !TEST_int_eq(my_param_argi[0], sizeof(buf)) +|| !TEST_long_eq(my_param_argl[0], 0L) +|| !TEST_long_eq(my_param_ret[0], 1L) +|| !TEST_ptr_eq(my_param_b[1], bio) +|| !TEST_int_eq(my_param_oper[1], BIO_CB_READ | BIO_CB_RETURN) +|| !TEST_ptr_eq(my_param_argp[1], buf) +|| !TEST_int_eq(my_param_argi[1], sizeof(buf)) +|| !TEST_long_eq(my_param_argl[1], 0L) +|| !TEST_long_eq(my_param_ret[1], (long)test1len)) +goto err; + +/* By default a mem bio returns -1 if it
[openssl-commits] Build completed: openssl OpenSSL_1_1_1-stable.20189
Build openssl OpenSSL_1_1_1-stable.20189 completed Commit 236119c48e by Richard Levitte on 10/4/2018 7:59 AM: Clean out aliases in include/openssl/symhacks.h Configure your notification preferences _ openssl-commits mailing list To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
[openssl-commits] [openssl] OpenSSL_1_1_0-stable update
The branch OpenSSL_1_1_0-stable has been updated via d39b27749f7402127a0be1e8dfffd710db52bde6 (commit) via 32451d8f861324697fc275593fbb830f80c1723b (commit) from 875ba8b21ecc65ad9a6bdc66971e50461660fcbb (commit) - Log - commit d39b27749f7402127a0be1e8dfffd710db52bde6 Author: Richard Levitte Date: Sun Sep 30 02:18:47 2018 +0200 Clean out aliases in include/openssl/symhacks.h Only a few clashing ones remain Reviewed-by: Paul Yang (Merged from https://github.com/openssl/openssl/pull/7331) (cherry picked from commit b44882a0bd0717e0aab84f5dc3ef81ab673155e9) commit 32451d8f861324697fc275593fbb830f80c1723b Author: Richard Levitte Date: Sun Sep 30 01:59:11 2018 +0200 Small cleanup (util/mkdef.pl, crypto/bio/bss_log.c, include/openssl/ocsp.h) BIO_s_log() is declared for everyone, so should return NULL when not actually implemented. Also, it had explicit platform limitations in util/mkdef.pl that didn't correspond to what was actually in code. While at it, a few other hard coded things that have lost their relevance were removed. include/openssl/ocsp.h had a few duplicate declarations. Reviewed-by: Paul Yang (Merged from https://github.com/openssl/openssl/pull/7331) (cherry picked from commit 7e09c5eaa57295f87453286ffe25277c2f2bc73f) --- Summary of changes: crypto/bio/bss_log.c | 5 + include/openssl/ocsp.h | 3 --- include/openssl/symhacks.h | 15 --- util/libcrypto.num | 2 +- util/mkdef.pl | 10 -- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 4719a5e..f090e82 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -404,4 +404,9 @@ static void xcloselog(BIO *bp) # endif /* Unix */ +#else /* NO_SYSLOG */ +const BIO_METHOD *BIO_s_log(void) +{ +return NULL; +} #endif /* NO_SYSLOG */ diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h index fd172fb..aa432f1 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h @@ -92,7 +92,6 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES; # define V_OCSP_RESPID_KEY 1 DEFINE_STACK_OF(OCSP_RESPID) -DECLARE_ASN1_FUNCTIONS(OCSP_RESPID) typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO; @@ -159,8 +158,6 @@ int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, int OCSP_REQ_CTX_nbio_d2i(OCSP_REQ_CTX *rctx, ASN1_VALUE **pval, const ASN1_ITEM *it); BIO *OCSP_REQ_CTX_get0_mem_bio(OCSP_REQ_CTX *rctx); -int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, - ASN1_VALUE *val); int OCSP_REQ_CTX_http(OCSP_REQ_CTX *rctx, const char *op, const char *path); int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req); int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx, diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index caf1f1a..b6d68ef 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -28,21 +28,6 @@ # undef i2d_ECPKPARAMETERS # define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS -/* - * These functions do not seem to exist! However, I'm paranoid... Original - * command in x509v3.h: These functions are being redefined in another - * directory, and clash when the linker is case-insensitive, so let's hide - * them a little, by giving them an extra 'o' at the beginning of the name... - */ -# undef X509v3_cleanup_extensions -# define X509v3_cleanup_extensions oX509v3_cleanup_extensions -# undef X509v3_add_extension -# define X509v3_add_extensionoX509v3_add_extension -# undef X509v3_add_netscape_extensions -# define X509v3_add_netscape_extensions oX509v3_add_netscape_extensions -# undef X509v3_add_standard_extensions -# define X509v3_add_standard_extensions oX509v3_add_standard_extensions - /* This one clashes with CMS_data_create */ # undef cms_Data_create # define cms_Data_create priv_cms_Data_create diff --git a/util/libcrypto.num b/util/libcrypto.num index c0fe79d..2390fa0 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -282,7 +282,7 @@ TS_REQ_free 282 1_1_0 EXIST::FUNCTION:TS PEM_read_DHparams 2831_1_0 EXIST::FUNCTION:DH,STDIO RSA_private_decrypt 2841_1_0 EXIST::FUNCTION:RSA X509V3_EXT_get_nid 2851_1_0 EXIST::FUNCTION: -BIO_s_log 2861_1_0 EXIST:!WIN32,!macintosh:FUNCTION: +BIO_s_log 2861_1_0 EXIST::FUNCTION: EC_POINT_set_to_infinity287
[openssl-commits] [openssl] OpenSSL_1_1_1-stable update
The branch OpenSSL_1_1_1-stable has been updated via 236119c48ecaac933fc52d7cbfd8d9214d216122 (commit) via 6babfb216137ab3e13c3219b45ac669a1f514901 (commit) from acb03676c50edeace8732fc0ee3fc9d3277f7a77 (commit) - Log - commit 236119c48ecaac933fc52d7cbfd8d9214d216122 Author: Richard Levitte Date: Sun Sep 30 02:18:47 2018 +0200 Clean out aliases in include/openssl/symhacks.h Only a few clashing ones remain Reviewed-by: Paul Yang (Merged from https://github.com/openssl/openssl/pull/7331) (cherry picked from commit b44882a0bd0717e0aab84f5dc3ef81ab673155e9) commit 6babfb216137ab3e13c3219b45ac669a1f514901 Author: Richard Levitte Date: Sun Sep 30 01:59:11 2018 +0200 Small cleanup (util/mkdef.pl, crypto/bio/bss_log.c, include/openssl/ocsp.h) BIO_s_log() is declared for everyone, so should return NULL when not actually implemented. Also, it had explicit platform limitations in util/mkdef.pl that didn't correspond to what was actually in code. While at it, a few other hard coded things that have lost their relevance were removed. include/openssl/ocsp.h had a few duplicate declarations. Reviewed-by: Paul Yang (Merged from https://github.com/openssl/openssl/pull/7331) (cherry picked from commit 7e09c5eaa57295f87453286ffe25277c2f2bc73f) --- Summary of changes: crypto/bio/bss_log.c | 5 + include/openssl/ocsp.h | 3 --- include/openssl/symhacks.h | 15 --- util/libcrypto.num | 2 +- util/mkdef.pl | 10 -- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/crypto/bio/bss_log.c b/crypto/bio/bss_log.c index 4324f24..e9ab932 100644 --- a/crypto/bio/bss_log.c +++ b/crypto/bio/bss_log.c @@ -408,4 +408,9 @@ static void xcloselog(BIO *bp) # endif /* Unix */ +#else /* NO_SYSLOG */ +const BIO_METHOD *BIO_s_log(void) +{ +return NULL; +} #endif /* NO_SYSLOG */ diff --git a/include/openssl/ocsp.h b/include/openssl/ocsp.h index 937b322..0a17166 100644 --- a/include/openssl/ocsp.h +++ b/include/openssl/ocsp.h @@ -93,7 +93,6 @@ typedef struct ocsp_resp_bytes_st OCSP_RESPBYTES; # define V_OCSP_RESPID_KEY 1 DEFINE_STACK_OF(OCSP_RESPID) -DECLARE_ASN1_FUNCTIONS(OCSP_RESPID) typedef struct ocsp_revoked_info_st OCSP_REVOKEDINFO; @@ -162,8 +161,6 @@ int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, int OCSP_REQ_CTX_nbio_d2i(OCSP_REQ_CTX *rctx, ASN1_VALUE **pval, const ASN1_ITEM *it); BIO *OCSP_REQ_CTX_get0_mem_bio(OCSP_REQ_CTX *rctx); -int OCSP_REQ_CTX_i2d(OCSP_REQ_CTX *rctx, const ASN1_ITEM *it, - ASN1_VALUE *val); int OCSP_REQ_CTX_http(OCSP_REQ_CTX *rctx, const char *op, const char *path); int OCSP_REQ_CTX_set1_req(OCSP_REQ_CTX *rctx, OCSP_REQUEST *req); int OCSP_REQ_CTX_add1_header(OCSP_REQ_CTX *rctx, diff --git a/include/openssl/symhacks.h b/include/openssl/symhacks.h index caf1f1a..b6d68ef 100644 --- a/include/openssl/symhacks.h +++ b/include/openssl/symhacks.h @@ -28,21 +28,6 @@ # undef i2d_ECPKPARAMETERS # define i2d_ECPKPARAMETERS i2d_UC_ECPKPARAMETERS -/* - * These functions do not seem to exist! However, I'm paranoid... Original - * command in x509v3.h: These functions are being redefined in another - * directory, and clash when the linker is case-insensitive, so let's hide - * them a little, by giving them an extra 'o' at the beginning of the name... - */ -# undef X509v3_cleanup_extensions -# define X509v3_cleanup_extensions oX509v3_cleanup_extensions -# undef X509v3_add_extension -# define X509v3_add_extensionoX509v3_add_extension -# undef X509v3_add_netscape_extensions -# define X509v3_add_netscape_extensions oX509v3_add_netscape_extensions -# undef X509v3_add_standard_extensions -# define X509v3_add_standard_extensions oX509v3_add_standard_extensions - /* This one clashes with CMS_data_create */ # undef cms_Data_create # define cms_Data_create priv_cms_Data_create diff --git a/util/libcrypto.num b/util/libcrypto.num index c4460c9..bad3a38 100644 --- a/util/libcrypto.num +++ b/util/libcrypto.num @@ -282,7 +282,7 @@ TS_REQ_free 282 1_1_0 EXIST::FUNCTION:TS PEM_read_DHparams 2831_1_0 EXIST::FUNCTION:DH,STDIO RSA_private_decrypt 2841_1_0 EXIST::FUNCTION:RSA X509V3_EXT_get_nid 2851_1_0 EXIST::FUNCTION: -BIO_s_log 2861_1_0 EXIST:!WIN32,!macintosh:FUNCTION: +BIO_s_log 2861_1_0 EXIST::FUNCTION: EC_POINT_set_to_infinity287