From c7d848e220ecb432faa05d2198ae689298d71728 Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 30 Apr 2021 09:11:42 +1000 Subject: [PATCH] remove end of line whitespace Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/14434) --- CHANGES.md | 2 +- apps/pkcs12.c | 4 ++-- doc/man3/PKCS12_PBE_keyivgen.pod | 2 +- doc/man3/PKCS12_add_cert.pod | 2 +- doc/man3/PKCS12_decrypt_skey.pod | 2 +- doc/man3/PKCS12_gen_mac.pod | 2 +- doc/man3/PKCS12_item_decrypt_d2i.pod | 2 +- test/helpers/pkcs12.c | 16 ++++++++-------- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1f6c72a1a0..e93d5df75a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -59,7 +59,7 @@ OpenSSL 3.0 PKCS5_pbe_set0_algor_ex(), PKCS5_pbe_set_ex(), PKCS5_pbkdf2_set_ex(), PKCS5_v2_PBE_keyivgen_ex(), PKCS5_v2_scrypt_keyivgen_ex(), PKCS8_decrypt_ex(), PKCS8_encrypt_ex(), PKCS8_set0_pbe_ex(). - + As part of this change the EVP_PBE_xxx APIs can also accept a library context and property query and will call an extended version of the key/IV derivation function which supports these parameters. This includes diff --git a/apps/pkcs12.c b/apps/pkcs12.c index c5a8fcdeda..c2508163f0 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -67,7 +67,7 @@ typedef enum OPTION_choice { OPT_NAME, OPT_CSP, OPT_CANAME, OPT_IN, OPT_OUT, OPT_PASSIN, OPT_PASSOUT, OPT_PASSWORD, OPT_CAPATH, OPT_CAFILE, OPT_CASTORE, OPT_NOCAPATH, OPT_NOCAFILE, OPT_NOCASTORE, OPT_ENGINE, - OPT_R_ENUM, OPT_PROV_ENUM, + OPT_R_ENUM, OPT_PROV_ENUM, #ifndef OPENSSL_NO_DES OPT_LEGACY_ALG #endif @@ -962,7 +962,7 @@ int dump_certs_pkeys_bag(BIO *out, const PKCS12_SAFEBAG *bag, break; case NID_secretBag: - if (options & INFO) + if (options & INFO) BIO_printf(bio_err, "Secret bag\n"); print_attribs(out, attrs, "Bag Attributes"); BIO_printf(bio_err, "Bag Type: "); diff --git a/doc/man3/PKCS12_PBE_keyivgen.pod b/doc/man3/PKCS12_PBE_keyivgen.pod index b0edb81c6c..2cbaa8ed81 100644 --- a/doc/man3/PKCS12_PBE_keyivgen.pod +++ b/doc/man3/PKCS12_PBE_keyivgen.pod @@ -2,7 +2,7 @@ =head1 NAME -PKCS12_PBE_keyivgen, PKCS12_PBE_keyivgen_ex, +PKCS12_PBE_keyivgen, PKCS12_PBE_keyivgen_ex, PKCS12_pbe_crypt, PKCS12_pbe_crypt_ex - PKCS#12 Password based encryption =head1 SYNOPSIS diff --git a/doc/man3/PKCS12_add_cert.pod b/doc/man3/PKCS12_add_cert.pod index 39d4779d11..ae3b21a13c 100644 --- a/doc/man3/PKCS12_add_cert.pod +++ b/doc/man3/PKCS12_add_cert.pod @@ -2,7 +2,7 @@ =head1 NAME -PKCS12_add_cert, PKCS12_add_key, PKCS12_add_key_ex, +PKCS12_add_cert, PKCS12_add_key, PKCS12_add_key_ex, PKCS12_add_secret - Add an object to a set of PKCS#12 safeBags =head1 SYNOPSIS diff --git a/doc/man3/PKCS12_decrypt_skey.pod b/doc/man3/PKCS12_decrypt_skey.pod index 79296c681a..a376ddc502 100644 --- a/doc/man3/PKCS12_decrypt_skey.pod +++ b/doc/man3/PKCS12_decrypt_skey.pod @@ -21,7 +21,7 @@ decrypt functions PKCS12_decrypt_skey() Decrypt the PKCS#8 shrouded keybag contained within I using the supplied password I of length I. -PKCS12_decrypt_skey_ex() is similar to the above but allows for a library context +PKCS12_decrypt_skey_ex() is similar to the above but allows for a library contex I and property query I to be used to select algorithm implementations. =head1 RETURN VALUES diff --git a/doc/man3/PKCS12_gen_mac.pod b/doc/man3/PKCS12_gen_mac.pod index 21854627a5..53b55e8703 100644 --- a/doc/man3/PKCS12_gen_mac.pod +++ b/doc/man3/PKCS12_gen_mac.pod @@ -2,7 +2,7 @@ =head1 NAME -PKCS12_gen_mac, PKCS12_setup_mac, PKCS12_set_mac, +PKCS12_gen_mac, PKCS12_setup_mac, PKCS12_set_mac, PKCS12_verify_mac - Functions to create and manipulate a PKCS#12 structure =head1 SYNOPSIS diff --git a/doc/man3/PKCS12_item_decrypt_d2i.pod b/doc/man3/PKCS12_item_decrypt_d2i.pod index cd5a993c7e..5bf498e8a8 100644 --- a/doc/man3/PKCS12_item_decrypt_d2i.pod +++ b/doc/man3/PKCS12_item_decrypt_d2i.pod @@ -32,7 +32,7 @@ encrypt/decrypt functions =head1 DESCRIPTION PKCS12_item_decrypt_d2i() and PKCS12_item_decrypt_d2i_ex() decrypt an octet -string containing an ASN.1 encoded object using the algorithm I and +string containing an ASN.1 encoded object using the algorithm I and password I of length I. If I is nonzero then the output buffer will zeroed after the decrypt. diff --git a/test/helpers/pkcs12.c b/test/helpers/pkcs12.c index 4d3abe06c7..bdc8585535 100644 --- a/test/helpers/pkcs12.c +++ b/test/helpers/pkcs12.c @@ -651,13 +651,13 @@ void check_secretbag(PKCS12_BUILDER *pb, int secret_nid, const char *secret, con if (!pb->success) return; - + bag = sk_PKCS12_SAFEBAG_value(pb->bags, pb->bag_idx++); if (!TEST_ptr(bag)) { pb->success = 0; return; - } - + } + if (!check_attrs(PKCS12_SAFEBAG_get0_attrs(bag), attrs) || !TEST_int_eq(PKCS12_SAFEBAG_get_nid(bag), NID_secretBag) || !TEST_int_eq(PKCS12_SAFEBAG_get_bag_nid(bag), secret_nid) @@ -693,13 +693,13 @@ void start_check_pkcs12_with_mac(PKCS12_BUILDER *pb, const PKCS12_ENC *mac) if (!pb->success) return; - p12 = from_bio_p12(pb->p12bio, mac); + p12 = from_bio_p12(pb->p12bio, mac); if (!TEST_ptr(p12)) { pb->success = 0; return; } - pb->safes = PKCS12_unpack_authsafes(p12); - if (!TEST_ptr(pb->safes)) + pb->safes = PKCS12_unpack_authsafes(p12); + if (!TEST_ptr(pb->safes)) pb->success = 0; pb->safe_idx = 0; @@ -724,8 +724,8 @@ void start_check_pkcs12_file(PKCS12_BUILDER *pb) pb->safe_idx = 0; PKCS12_free(p12); -} - +} + void start_check_pkcs12_file_with_mac(PKCS12_BUILDER *pb, const PKCS12_ENC *mac) { PKCS12 *p12; -- GitLab