diff options
| author |  Martin Szulecki | 2013-09-06 01:19:12 +0200 |
|---|---|---|
| committer | Martin Szulecki | 2013-09-17 11:43:34 +0200 |
| commit | 49eb72122d3d95f6aa80f6b17c393d75fd6077bc (patch) | |
| tree | 78b8459804c14ca1545dbbc7689f94e11c7c8669 /common/userpref.c | |
| parent | 55869758d72338696139806f32cee696848f9875 (diff) | |
| download | libimobiledevice-49eb72122d3d95f6aa80f6b17c393d75fd6077bc.tar.gz libimobiledevice-49eb72122d3d95f6aa80f6b17c393d75fd6077bc.tar.bz2 | |
Fix broken build of GnuTLS and silence two compiler warnings
Diffstat (limited to 'common/userpref.c')
| -rw-r--r-- | common/userpref.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/userpref.c b/common/userpref.c index 4f5d6d7..571b660 100644 --- a/common/userpref.c +++ b/common/userpref.c | |||
| @@ -986,7 +986,7 @@ static userpref_error_t userpref_device_record_import_key(const char* udid, cons | |||
| 986 | key->size = length; | 986 | key->size = length; |
| 987 | ret = USERPREF_E_SUCCESS; | 987 | ret = USERPREF_E_SUCCESS; |
| 988 | #else | 988 | #else |
| 989 | key_data_t pem = { buffer, length }; | 989 | key_data_t pem = { (unsigned char*)buffer, length }; |
| 990 | if (GNUTLS_E_SUCCESS == gnutls_x509_privkey_import(key, &pem, GNUTLS_X509_FMT_PEM)) | 990 | if (GNUTLS_E_SUCCESS == gnutls_x509_privkey_import(key, &pem, GNUTLS_X509_FMT_PEM)) |
| 991 | ret = USERPREF_E_SUCCESS; | 991 | ret = USERPREF_E_SUCCESS; |
| 992 | else | 992 | else |
| @@ -1036,7 +1036,7 @@ static userpref_error_t userpref_device_record_import_crt(const char* udid, cons | |||
| 1036 | cert->size = length; | 1036 | cert->size = length; |
| 1037 | ret = USERPREF_E_SUCCESS; | 1037 | ret = USERPREF_E_SUCCESS; |
| 1038 | #else | 1038 | #else |
| 1039 | key_data_t pem = { buffer, length }; | 1039 | key_data_t pem = { (unsigned char*)buffer, length }; |
| 1040 | if (GNUTLS_E_SUCCESS == gnutls_x509_crt_import(cert, &pem, GNUTLS_X509_FMT_PEM)) | 1040 | if (GNUTLS_E_SUCCESS == gnutls_x509_crt_import(cert, &pem, GNUTLS_X509_FMT_PEM)) |
| 1041 | ret = USERPREF_E_SUCCESS; | 1041 | ret = USERPREF_E_SUCCESS; |
| 1042 | else | 1042 | else |