Merge branch 'fix-1541' into 'master'

Fix ios enrolment error

Closes product-iots#1541

See merge request entgra/carbon-device-mgt!919
master
Pahansith Gunathilake 2 years ago
commit c0ac653ca6

@ -400,23 +400,39 @@ public class CertificateGenerator {
generateCertificate(byteArrayInputStream); generateCertificate(byteArrayInputStream);
if (reqCert != null && reqCert.getSerialNumber() != null) { if (reqCert != null && reqCert.getSerialNumber() != null) {
Certificate lookUpCertificate = keyStoreReader.getCertificateByAlias( log.debug("looking up certificate for serial: " + reqCert.getSerialNumber().toString());
CertificateResponse lookUpCertificate = keyStoreReader.getCertificateBySerial(
reqCert.getSerialNumber().toString()); reqCert.getSerialNumber().toString());
if (lookUpCertificate != null && lookUpCertificate.getCertificate() != null) {
if (lookUpCertificate instanceof X509Certificate) { log.debug("certificate found for serial: " + reqCert.getSerialNumber()
return (X509Certificate) lookUpCertificate; .toString());
Certificate certificate = (Certificate) Serializer.deserialize(lookUpCertificate.getCertificate());
if (certificate instanceof X509Certificate) {
return (X509Certificate) certificate;
} }
} else {
log.debug("certificate not found for serial: " + reqCert.getSerialNumber()
.toString());
}
} }
} }
} catch (CMSException e) { } catch (CMSException e) {
String errorMsg = "CMSException when decoding certificate signature"; String errorMsg = "CMSException when decoding certificate signature";
log.error(errorMsg);
throw new KeystoreException(errorMsg, e); throw new KeystoreException(errorMsg, e);
} catch (IOException e) { } catch (IOException e) {
String errorMsg = "IOException when decoding certificate signature"; String errorMsg = "IOException when decoding certificate signature";
log.error(errorMsg);
throw new KeystoreException(errorMsg, e); throw new KeystoreException(errorMsg, e);
} catch (CertificateException e) { } catch (CertificateException e) {
String errorMsg = "CertificateException when decoding certificate signature"; String errorMsg = "CertificateException when decoding certificate signature";
log.error(errorMsg);
throw new KeystoreException(errorMsg, e);
} catch (ClassNotFoundException e) {
String errorMsg = "Certificate class not found";
log.error(errorMsg);
throw new KeystoreException(errorMsg, e); throw new KeystoreException(errorMsg, e);
} }

Loading…
Cancel
Save