Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test cleanup #2000

Merged
merged 2 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion crypto/asn1/asn1_test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -2315,7 +2315,7 @@ const struct GetObjectTestData {
{{0x61, 0x80, 0xC2, 0x02, 0xAB, 0xCD, 0x00, 0x00}, 0x21, 0x01, 0x40, 0},
};

static void verifyGetObject(GetObjectTestData t) {
static void verifyGetObject(const GetObjectTestData& t) {
long length;
int tag;
int tag_class;
Expand Down
3 changes: 1 addition & 2 deletions crypto/pkcs7/pkcs7.c
Original file line number Diff line number Diff line change
Expand Up @@ -644,7 +644,6 @@ static int pkcs7_bio_add_digest(BIO **pbio, X509_ALGOR *alg) {
OPENSSL_PUT_ERROR(PKCS7, ERR_R_BIO_LIB);
goto err;
}
btmp = NULL;

return 1;

Expand Down Expand Up @@ -1014,7 +1013,7 @@ OPENSSL_END_ALLOW_DEPRECATED
if (si_sk != NULL) {
for (size_t ii = 0; ii < sk_PKCS7_SIGNER_INFO_num(si_sk); ii++) {
si = sk_PKCS7_SIGNER_INFO_value(si_sk, ii);
if (si->pkey == NULL) {
if (si == NULL || si->pkey == NULL) {
continue;
}
int sign_nid = OBJ_obj2nid(si->digest_alg->algorithm);
Expand Down
Loading