On Wed, Nov 22, 2023 at 3:21 PM Juerg Haefliger <juergh@xxxxxxxxx> wrote: > > On Tue, 21 Nov 2023 03:40:44 +0000 > "Yusong Gao" <a869920004@xxxxxxxxx> wrote: > > > There are some wrong return values check in sign-file when call > > OpenSSL > > API. The ERR() check cond is wrong because of the program only check > > the > > return value is < 0 instead of <= 0. For example: > > 1. CMS_final() return 1 for success or 0 for failure. > > 2. i2d_CMS_bio_stream() returns 1 for success or 0 for failure. > > 3. i2d_TYPEbio() return 1 for success and 0 for failure. > > 4. BIO_free() return 1 for success and 0 for failure. > > Good catch! In this case I'd probably be more strict and check for '!= > 1'. > See below. > > ...Juerg > > > > Link: https://www.openssl.org/docs/manmaster/man3/ > > Fixes: e5a2e3c84782 ("scripts/sign-file.c: Add support for signing > > with a raw signature") > > > > Signed-off-by: Yusong Gao <a869920004@xxxxxxxxx> > > --- > > V1, V2: Clarify the description of git message. > > --- > > Â scripts/sign-file.c | 12 ++++++------ > > Â 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/scripts/sign-file.c b/scripts/sign-file.c > > index 598ef5465f82..dcebbcd6bebd 100644 > > --- a/scripts/sign-file.c > > +++ b/scripts/sign-file.c > > @@ -322,7 +322,7 @@ int main(int argc, char **argv) > > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â CMS_NOSMIMECAP | use_keyid | > > Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â use_signed_attrs), > > Â Â Â Â Â Â Â Â Â "CMS_add1_signer"); > > - Â Â Â Â Â Â ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) > > < 0, > > + Â Â Â Â Â Â ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) > > <= 0, > > ERR(CMS_final(cms, bm, NULL, CMS_NOCERTS | CMS_BINARY) != 1, > > > > Â Â Â Â Â Â Â Â Â "CMS_final"); > > > > Â #else > > @@ -341,10 +341,10 @@ int main(int argc, char **argv) > > Â Â Â Â Â Â Â Â Â Â Â b = BIO_new_file(sig_file_name, "wb"); > > Â Â Â Â Â Â Â Â Â Â Â ERR(!b, "%s", sig_file_name); > > Â #ifndef USE_PKCS7 > > - Â Â Â Â Â Â Â Â Â Â ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) < 0, > > + Â Â Â Â Â Â Â Â Â Â ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) <= 0, > > ERR(i2d_CMS_bio_stream(b, cms, NULL, 0) != 1, > > > > Â Â Â Â Â Â Â Â Â Â Â Â Â "%s", sig_file_name); > > Â #else > > - Â Â Â Â Â Â Â Â Â Â ERR(i2d_PKCS7_bio(b, pkcs7) < 0, > > + Â Â Â Â Â Â Â Â Â Â ERR(i2d_PKCS7_bio(b, pkcs7) <= 0, > > ERR(i2d_PKCS7_bio(b, pkcs7) != 1, > > > > Â Â Â Â Â Â Â Â Â Â Â Â Â "%s", sig_file_name); > > Â #endif > > Â Â Â Â Â Â Â Â Â Â Â BIO_free(b); > > @@ -374,9 +374,9 @@ int main(int argc, char **argv) > > > > Â Â Â if (!raw_sig) { > > Â #ifndef USE_PKCS7 > > - Â Â Â Â Â Â ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) < 0, "%s", > > dest_name); > > + Â Â Â Â Â Â ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) <= 0, "%s", > > dest_name); > > > ERR(i2d_CMS_bio_stream(bd, cms, NULL, 0) != 1, "%s", dest_name); > > > > Â #else > > - Â Â Â Â Â Â ERR(i2d_PKCS7_bio(bd, pkcs7) < 0, "%s", dest_name); > > + Â Â Â Â Â Â ERR(i2d_PKCS7_bio(bd, pkcs7) <= 0, "%s", dest_name); > > ERR(i2d_PKCS7_bio(bd, pkcs7) != 1, "%s", dest_name); > > > > Â #endif > > Â Â Â } else { > > Â Â Â Â Â Â Â BIO *b; > > @@ -396,7 +396,7 @@ int main(int argc, char **argv) > > Â Â Â ERR(BIO_write(bd, &sig_info, sizeof(sig_info)) < 0, "%s", > > dest_name); > > Â Â Â ERR(BIO_write(bd, magic_number, sizeof(magic_number) - 1) < 0, > > "%s", dest_name); > > > > - Â Â ERR(BIO_free(bd) < 0, "%s", dest_name); > > + Â Â ERR(BIO_free(bd) <= 0, "%s", dest_name); > > ERR(BIO_free(bd) != 1, "%s", dest_name); > > > > > > Â Â Â /* Finally, if we're signing in place, replace the original. > > */ > > Â Â Â if (replace_orig) > > -- > > 2.34.1 > > > Agreed. Will do. Thanks for your review. BR, Yusong Gao
