fix(Crypto) Update method to extract friendlyName from certificate (#3787)

trzeciak · web-flow · commit 1fcbfc609497 · 2022-09-11T12:28:41.000-05:00
* fix(Crypto) Update method to extract friendlyName from certificate
diff --git a/Crypto/src/PKCS12Container.cpp b/Crypto/src/PKCS12Container.cpp
@@ -128,19 +128,12 @@ std::string PKCS12Container::extractFriendlyName(X509* pCert)
 	std::string friendlyName;
 	if(pCert)
 	{
-		STACK_OF(PKCS12_SAFEBAG)*pBags = 0;
-		PKCS12_SAFEBAG*pBag = PKCS12_add_cert(&pBags, pCert);
-		if(pBag)
+		int length = 0;
+		char* pBuffer = reinterpret_cast<char*>(X509_alias_get0(pCert, &length));
+		if (pBuffer)
 		{
-			char* pBuffer = PKCS12_get_friendlyname(pBag);
-			if(pBuffer)
-			{
-				friendlyName = pBuffer;
-				OPENSSL_free(pBuffer);
-			}
-			if(pBags) sk_PKCS12_SAFEBAG_pop_free(pBags, PKCS12_SAFEBAG_free);
+			friendlyName.append(pBuffer, length);
 		}
-		else throw OpenSSLException("PKCS12Container::extractFriendlyName()");
 	}
 	else throw NullPointerException("PKCS12Container::extractFriendlyName()");
 

Original file line number	Diff line number	Diff line change
`@@ -128,19 +128,12 @@ std::string PKCS12Container::extractFriendlyName(X509* pCert)`
`128`	`128`	`std::string friendlyName;`
`129`	`129`	`if(pCert)`
`130`	`130`	`{`
`131`		`- STACK_OF(PKCS12_SAFEBAG)*pBags = 0;`
`132`		`- PKCS12_SAFEBAG*pBag = PKCS12_add_cert(&pBags, pCert);`
`133`		`- if(pBag)`
	`131`	`+ int length = 0;`
	`132`	`+ char* pBuffer = reinterpret_cast<char*>(X509_alias_get0(pCert, &length));`
	`133`	`+ if (pBuffer)`
`134`	`134`	`{`
`135`		`- char* pBuffer = PKCS12_get_friendlyname(pBag);`
`136`		`- if(pBuffer)`
`137`		`- {`
`138`		`- friendlyName = pBuffer;`
`139`		`- OPENSSL_free(pBuffer);`
`140`		`- }`
`141`		`- if(pBags) sk_PKCS12_SAFEBAG_pop_free(pBags, PKCS12_SAFEBAG_free);`
	`135`	`+ friendlyName.append(pBuffer, length);`
`142`	`136`	`}`
`143`		`- else throw OpenSSLException("PKCS12Container::extractFriendlyName()");`
`144`	`137`	`}`
`145`	`138`	`else throw NullPointerException("PKCS12Container::extractFriendlyName()");`
`146`	`139`