summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar Nikias Bassen2014-03-21 18:14:15 +0100
committerGravatar Nikias Bassen2014-03-21 18:14:15 +0100
commit03ad1dc56830bd6e921e58ecce2b8b0fd3aea675 (patch)
treee8d806acde618ba817a165b14943dd1ffec47256 /src
parent1a0ce00184f560556d5e823dc8b1258a79ed5aaa (diff)
downloadlibimobiledevice-03ad1dc56830bd6e921e58ecce2b8b0fd3aea675.tar.gz
libimobiledevice-03ad1dc56830bd6e921e58ecce2b8b0fd3aea675.tar.bz2
userpref: merge pair_record_generate_from_device_public_key() into pair_record_generate_keys_and_certs()
Diffstat (limited to 'src')
-rw-r--r--src/lockdown.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/src/lockdown.c b/src/lockdown.c
index aff682a..0efe30e 100644
--- a/src/lockdown.c
+++ b/src/lockdown.c
@@ -852,21 +852,7 @@ static lockdownd_error_t pair_record_generate(lockdownd_client_t client, plist_t
*pair_record = plist_new_dict();
userpref_error_t uret = USERPREF_E_SUCCESS;
- uret = pair_record_generate_keys_and_certs(*pair_record);
- switch(uret) {
- case USERPREF_E_INVALID_ARG:
- ret = LOCKDOWN_E_INVALID_ARG;
- break;
- case USERPREF_E_INVALID_CONF:
- ret = LOCKDOWN_E_INVALID_CONF;
- break;
- case USERPREF_E_SSL_ERROR:
- ret = LOCKDOWN_E_SSL_ERROR;
- default:
- break;
- }
-
- uret = pair_record_generate_from_device_public_key(*pair_record, public_key);
+ uret = pair_record_generate_keys_and_certs(*pair_record, public_key);
switch(uret) {
case USERPREF_E_INVALID_ARG:
ret = LOCKDOWN_E_INVALID_ARG;