Beautifying. Sorry, but code that's slammed to the far left is not (5ba7c902) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

crypto/pkcs12/p12_kiss.c

+34 −29

Original line number	Diff line number	Diff line
		@@ -77,14 +77,17 @@ int PKCS12_parse (PKCS12 p12, const char pass, EVP_PKEY pkey, X509 cert,

		/* Check for NULL PKCS12 structure */

		if(!p12) {
		if(!p12)
		{
		PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_INVALID_NULL_PKCS12_POINTER);
		return 0;
		}

		/* Allocate stack for ca certificates if needed */
		if ((ca != NULL) && (*ca == NULL)) {
		if (!(*ca = sk_new(NULL))) {
		if ((ca != NULL) && (*ca == NULL))
		{
		if (!(*ca = sk_new(NULL)))
		{
		PKCS12err(PKCS12_F_PKCS12_PARSE,ERR_R_MALLOC_FAILURE);
		return 0;
		}
		@@ -95,12 +98,14 @@ if(cert) *cert = NULL;

		/* Check the mac */

		if (!PKCS12_verify_mac (p12, pass, -1)) {
		if (!PKCS12_verify_mac (p12, pass, -1))
		{
		PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_MAC_VERIFY_FAILURE);
		goto err;
		}

		if (!parse_pk12 (p12, pass, -1, pkey, cert, ca)) {
		if (!parse_pk12 (p12, pass, -1, pkey, cert, ca))
		{
		PKCS12err(PKCS12_F_PKCS12_PARSE,PKCS12_R_PARSE_ERROR);
		goto err;
		}