diff options
| author | 2014-03-21 20:05:50 +0100 | |
|---|---|---|
| committer | 2014-03-21 20:05:50 +0100 | |
| commit | 5578c5bcd5915b3b2e3cbdeeb33a989fe0bee8ab (patch) | |
| tree | a6161cfe41e1a77789ce2529b0006a24cdaccf4e /common/userpref.c | |
| parent | ecb3742ef8ddbab4ffc19fe3e0edcee9b3fc6f04 (diff) | |
| download | libimobiledevice-5578c5bcd5915b3b2e3cbdeeb33a989fe0bee8ab.tar.gz libimobiledevice-5578c5bcd5915b3b2e3cbdeeb33a989fe0bee8ab.tar.bz2 | |
userpref: Try to output similar error messages in GnuTLS and OpenSSL logic
Diffstat (limited to 'common/userpref.c')
| -rw-r--r-- | common/userpref.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/common/userpref.c b/common/userpref.c index 04341a4..808c55c 100644 --- a/common/userpref.c +++ b/common/userpref.c | |||
| @@ -545,7 +545,7 @@ userpref_error_t pair_record_generate_keys_and_certs(plist_t pair_record, key_da | |||
| 545 | { | 545 | { |
| 546 | BIO *membp = BIO_new_mem_buf(public_key.data, public_key.size); | 546 | BIO *membp = BIO_new_mem_buf(public_key.data, public_key.size); |
| 547 | if (!PEM_read_bio_RSAPublicKey(membp, &pubkey, NULL, NULL)) { | 547 | if (!PEM_read_bio_RSAPublicKey(membp, &pubkey, NULL, NULL)) { |
| 548 | debug_info("Could not read public key"); | 548 | debug_info("WARNING: Could not read public key"); |
| 549 | } | 549 | } |
| 550 | BIO_free(membp); | 550 | BIO_free(membp); |
| 551 | } | 551 | } |
| @@ -706,6 +706,8 @@ userpref_error_t pair_record_generate_keys_and_certs(plist_t pair_record, key_da | |||
| 706 | } | 706 | } |
| 707 | if (pkcs1) | 707 | if (pkcs1) |
| 708 | asn1_delete_structure(&pkcs1); | 708 | asn1_delete_structure(&pkcs1); |
| 709 | } else { | ||
| 710 | debug_info("WARNING: Could not read public key"); | ||
| 709 | } | 711 | } |
| 710 | 712 | ||
| 711 | /* now generate certificates */ | 713 | /* now generate certificates */ |
| @@ -747,6 +749,8 @@ userpref_error_t pair_record_generate_keys_and_certs(plist_t pair_record, key_da | |||
| 747 | dev_cert_pem.data = gnutls_malloc(export_size); | 749 | dev_cert_pem.data = gnutls_malloc(export_size); |
| 748 | gnutls_x509_crt_export(dev_cert, GNUTLS_X509_FMT_PEM, dev_cert_pem.data, &export_size); | 750 | gnutls_x509_crt_export(dev_cert, GNUTLS_X509_FMT_PEM, dev_cert_pem.data, &export_size); |
| 749 | dev_cert_pem.size = export_size; | 751 | dev_cert_pem.size = export_size; |
| 752 | } else { | ||
| 753 | debug_info("ERROR: Signing device certificate with root private key failed!"); | ||
| 750 | } | 754 | } |
| 751 | } | 755 | } |
| 752 | 756 | ||
