openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

remove end of line whitespace 

Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14434)
This commit is contained in:
Pauli 2021-04-30 09:11:42 +10:00
parent b536880c45
commit c7d848e220
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES.md
View File

@ -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

4
apps/pkcs12.c
View File

@ -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: ");

2
doc/man3/PKCS12_PBE_keyivgen.pod
View File

@ -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

2
doc/man3/PKCS12_add_cert.pod
View File

@ -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

2
doc/man3/PKCS12_decrypt_skey.pod
View File

@ -21,7 +21,7 @@ decrypt functions
PKCS12_decrypt_skey() Decrypt the PKCS#8 shrouded keybag contained within I<bag>
using the supplied password I<pass> of length I<passlen>.
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<ctx> and property query I<propq> to be used to select algorithm implementations.
=head1 RETURN VALUES

2
doc/man3/PKCS12_gen_mac.pod
View File

@ -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

2
doc/man3/PKCS12_item_decrypt_d2i.pod
View File

@ -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<algor> and
string containing an ASN.1 encoded object using the algorithm I<algor> and
password I<pass> of length I<passlen>. If I<zbuf> is nonzero then the output
buffer will zeroed after the decrypt.

16
test/helpers/pkcs12.c
View File

@ -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;