Merged in Jonathan's libplist libiphone. [#2 state:resolved]

1 files changed, 10 insertions, 40 deletions

diff --git a/src/userpref.h b/src/userpref.h
index e7835d0..deced04 100644
--- a/src/userpref.h
+++ b/src/userpref.h
@@ -8,64 +8,34 @@
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
 #ifndef USERPREF_H
 #define USERPREF_H
 
 #include <gnutls/gnutls.h>
-/**
- * Method to get user's HostID. Caller must free returned buffer.
- * 
- * @return the HostID if exist in config file. Returns NULL otherwise.
- */
-char *get_host_id(void);
+#include "libiphone/libiphone.h"
 
-/**
- * Determine if we already paired this device.
- * 
- * @return 1 if device is already paired. Returns 0 otherwise.
- */
-int is_device_known(char *uid);
 
-/**
- * @return 1 if everything went well. Returns 0 otherwise.
- */
-int store_device_public_key(char *uid, char *public_key);
+iphone_error_t get_keys_and_certs(gnutls_x509_privkey_t root_privkey, gnutls_x509_crt_t root_crt, gnutls_x509_privkey_t host_privkey, gnutls_x509_crt_t host_crt);
 
-/**
- * @return 1 if everything went well. Returns 0 otherwise.
- */
-int get_root_private_key(gnutls_datum_t * root_privkey);
+iphone_error_t get_certs_as_pem(gnutls_datum_t *pem_root_cert, gnutls_datum_t *pem_host_cert);
 
-/**
- * @return 1 if everything went well. Returns 0 otherwise.
- */
-int get_host_private_key(gnutls_datum_t * host_privkey);
+char *get_host_id(void);
 
-/**
- * @return 1 if everything went well. Returns 0 otherwise.
- */
-int get_root_certificate(gnutls_datum_t * root_cert);
+int is_device_known(char *uid);
 
-/**
- * @return 1 if everything went well. Returns 0 otherwise.
- */
-int get_host_certificate(gnutls_datum_t * host_cert);
+int store_device_public_key(char *uid, gnutls_datum_t public_key);
 
-/**
- * Setup a brand new config file.
- * @return 1 if everything went well. Returns 0 otherwise.
- */
-int init_config_file(char *host_id, gnutls_datum_t * root_key, gnutls_datum_t * host_key, gnutls_datum_t * root_cert,
+int init_config_file( gnutls_datum_t * root_key, gnutls_datum_t * host_key, gnutls_datum_t * root_cert,
                                          gnutls_datum_t * host_cert);
 #endif