glib2 1.1.8-x86-mingw32 → 1.1.9-x86-mingw32

data/vendor/local/include/gnutls/ocsp.h

@@ -0,0 +1,259 @@
+/*
+ * Copyright (C) 2011-2012 Free Software Foundation, Inc.
+ *
+ * Author: Simon Josefsson
+ *
+ * This file is part of GnuTLS.
+ *
+ * The GnuTLS is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 3 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 program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+/* Online Certificate Status Protocol - RFC 2560
+ */
+
+#ifndef GNUTLS_OCSP_H
+#define GNUTLS_OCSP_H
+
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#define GNUTLS_OCSP_NONCE "1.3.6.1.5.5.7.48.1.2"
+
+/**
+ * gnutls_ocsp_print_formats_t:
+ * @GNUTLS_OCSP_PRINT_FULL: Full information about OCSP request/response.
+ * @GNUTLS_OCSP_PRINT_COMPACT: More compact information about OCSP request/response.
+ *
+ * Enumeration of different OCSP printing variants.
+ */
+typedef enum gnutls_ocsp_print_formats_t
+  {
+    GNUTLS_OCSP_PRINT_FULL = 0,
+    GNUTLS_OCSP_PRINT_COMPACT = 1,
+  } gnutls_ocsp_print_formats_t;
+
+/**
+ * gnutls_ocsp_resp_status_t:
+ * @GNUTLS_OCSP_RESP_SUCCESSFUL: Response has valid confirmations.
+ * @GNUTLS_OCSP_RESP_MALFORMEDREQUEST: Illegal confirmation request
+ * @GNUTLS_OCSP_RESP_INTERNALERROR: Internal error in issuer
+ * @GNUTLS_OCSP_RESP_TRYLATER: Try again later
+ * @GNUTLS_OCSP_RESP_SIGREQUIRED: Must sign the request
+ * @GNUTLS_OCSP_RESP_UNAUTHORIZED: Request unauthorized
+ *
+ * Enumeration of different OCSP response status codes.
+ */
+typedef enum gnutls_ocsp_resp_status_t
+  {
+    GNUTLS_OCSP_RESP_SUCCESSFUL = 0,
+    GNUTLS_OCSP_RESP_MALFORMEDREQUEST = 1,
+    GNUTLS_OCSP_RESP_INTERNALERROR = 2,
+    GNUTLS_OCSP_RESP_TRYLATER = 3,
+    GNUTLS_OCSP_RESP_SIGREQUIRED = 5,
+    GNUTLS_OCSP_RESP_UNAUTHORIZED = 6
+  } gnutls_ocsp_resp_status_t;
+
+/**
+ * gnutls_ocsp_cert_status_t:
+ * @GNUTLS_OCSP_CERT_GOOD: Positive response to status inquiry.
+ * @GNUTLS_OCSP_CERT_REVOKED: Certificate has been revoked.
+ * @GNUTLS_OCSP_CERT_UNKNOWN: The responder doesn't know about the
+ *   certificate.
+ *
+ * Enumeration of different OCSP response certificate status codes.
+ */
+typedef enum gnutls_ocsp_cert_status_t
+  {
+    GNUTLS_OCSP_CERT_GOOD = 0,
+    GNUTLS_OCSP_CERT_REVOKED = 1,
+    GNUTLS_OCSP_CERT_UNKNOWN = 2
+  } gnutls_ocsp_cert_status_t;
+
+/**
+ * gnutls_x509_crl_reason_t:
+ * @GNUTLS_X509_CRLREASON_UNSPECIFIED: Unspecified reason.
+ * @GNUTLS_X509_CRLREASON_KEYCOMPROMISE: Private key compromised.
+ * @GNUTLS_X509_CRLREASON_CACOMPROMISE: CA compromised.
+ * @GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED: Affiliation has changed.
+ * @GNUTLS_X509_CRLREASON_SUPERSEDED: Certificate superseded.
+ * @GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION: Operation has ceased.
+ * @GNUTLS_X509_CRLREASON_CERTIFICATEHOLD: Certificate is on hold.
+ * @GNUTLS_X509_CRLREASON_REMOVEFROMCRL: Will be removed from delta CRL.
+ * @GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN: Privilege withdrawn.
+ * @GNUTLS_X509_CRLREASON_AACOMPROMISE: AA compromised.
+ *
+ * Enumeration of different reason codes.  Note that this
+ * corresponds to the CRLReason ASN.1 enumeration type, and not the
+ * ReasonFlags ASN.1 bit string.
+ */
+typedef enum gnutls_x509_crl_reason_t
+  {
+    GNUTLS_X509_CRLREASON_UNSPECIFIED = 0,
+    GNUTLS_X509_CRLREASON_KEYCOMPROMISE = 1,
+    GNUTLS_X509_CRLREASON_CACOMPROMISE = 2,
+    GNUTLS_X509_CRLREASON_AFFILIATIONCHANGED = 3,
+    GNUTLS_X509_CRLREASON_SUPERSEDED = 4,
+    GNUTLS_X509_CRLREASON_CESSATIONOFOPERATION = 5,
+    GNUTLS_X509_CRLREASON_CERTIFICATEHOLD = 6,
+    GNUTLS_X509_CRLREASON_REMOVEFROMCRL = 8,
+    GNUTLS_X509_CRLREASON_PRIVILEGEWITHDRAWN = 9,
+    GNUTLS_X509_CRLREASON_AACOMPROMISE = 10
+  } gnutls_x509_crl_reason_t;
+
+/**
+ * gnutls_ocsp_verify_reason_t:
+ * @GNUTLS_OCSP_VERIFY_SIGNER_NOT_FOUND: Signer cert not found.
+ * @GNUTLS_OCSP_VERIFY_SIGNER_KEYUSAGE_ERROR: Signer keyusage bits incorrect.
+ * @GNUTLS_OCSP_VERIFY_UNTRUSTED_SIGNER: Signer is not trusted.
+ * @GNUTLS_OCSP_VERIFY_INSECURE_ALGORITHM: Signature using insecure algorithm.
+ * @GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE: Signature mismatch.
+ * @GNUTLS_OCSP_VERIFY_CERT_NOT_ACTIVATED: Signer cert is not yet activated.
+ * @GNUTLS_OCSP_VERIFY_CERT_EXPIRED: Signer cert has expired.
+ *
+ * Enumeration of OCSP verify status codes, used by
+ * gnutls_ocsp_resp_verify() and gnutls_ocsp_resp_verify_direct().
+ */
+typedef enum gnutls_ocsp_verify_reason_t
+  {
+    GNUTLS_OCSP_VERIFY_SIGNER_NOT_FOUND = 1,
+    GNUTLS_OCSP_VERIFY_SIGNER_KEYUSAGE_ERROR = 2,
+    GNUTLS_OCSP_VERIFY_UNTRUSTED_SIGNER = 4,
+    GNUTLS_OCSP_VERIFY_INSECURE_ALGORITHM = 8,
+    GNUTLS_OCSP_VERIFY_SIGNATURE_FAILURE = 16,
+    GNUTLS_OCSP_VERIFY_CERT_NOT_ACTIVATED = 32,
+    GNUTLS_OCSP_VERIFY_CERT_EXPIRED = 64
+  } gnutls_ocsp_verify_reason_t;
+
+  struct gnutls_ocsp_req_int;
+  typedef struct gnutls_ocsp_req_int *gnutls_ocsp_req_t;
+
+  int gnutls_ocsp_req_init (gnutls_ocsp_req_t * req);
+  void gnutls_ocsp_req_deinit (gnutls_ocsp_req_t req);
+
+  int gnutls_ocsp_req_import (gnutls_ocsp_req_t req,
+			      const gnutls_datum_t * data);
+  int gnutls_ocsp_req_export (gnutls_ocsp_req_t req, gnutls_datum_t * data);
+  int gnutls_ocsp_req_print (gnutls_ocsp_req_t req,
+			     gnutls_ocsp_print_formats_t format,
+			     gnutls_datum_t * out);
+
+  int gnutls_ocsp_req_get_version (gnutls_ocsp_req_t req);
+
+  int gnutls_ocsp_req_get_cert_id (gnutls_ocsp_req_t req,
+				   unsigned indx,
+				   gnutls_digest_algorithm_t *digest,
+				   gnutls_datum_t *issuer_name_hash,
+				   gnutls_datum_t *issuer_key_hash,
+				   gnutls_datum_t *serial_number);
+  int gnutls_ocsp_req_add_cert_id (gnutls_ocsp_req_t req,
+				   gnutls_digest_algorithm_t digest,
+				   const gnutls_datum_t *issuer_name_hash,
+				   const gnutls_datum_t *issuer_key_hash,
+				   const gnutls_datum_t *serial_number);
+  int gnutls_ocsp_req_add_cert (gnutls_ocsp_req_t req,
+				gnutls_digest_algorithm_t digest,
+				gnutls_x509_crt_t issuer,
+				gnutls_x509_crt_t cert);
+
+  int gnutls_ocsp_req_get_extension (gnutls_ocsp_req_t req,
+				     unsigned indx,
+				     gnutls_datum_t *oid,
+				     unsigned int *critical,
+				     gnutls_datum_t *data);
+  int gnutls_ocsp_req_set_extension (gnutls_ocsp_req_t req,
+				     const char *oid,
+				     unsigned int critical,
+				     const gnutls_datum_t *data);
+
+  int gnutls_ocsp_req_get_nonce (gnutls_ocsp_req_t req,
+				 unsigned int *critical,
+				 gnutls_datum_t *nonce);
+  int gnutls_ocsp_req_set_nonce (gnutls_ocsp_req_t req,
+				 unsigned int critical,
+				 const gnutls_datum_t *nonce);
+  int gnutls_ocsp_req_randomize_nonce (gnutls_ocsp_req_t req);
+
+  struct gnutls_ocsp_resp_int;
+  typedef struct gnutls_ocsp_resp_int *gnutls_ocsp_resp_t;
+
+  int gnutls_ocsp_resp_init (gnutls_ocsp_resp_t * resp);
+  void gnutls_ocsp_resp_deinit (gnutls_ocsp_resp_t resp);
+
+  int gnutls_ocsp_resp_import (gnutls_ocsp_resp_t resp,
+			       const gnutls_datum_t * data);
+  int gnutls_ocsp_resp_export (gnutls_ocsp_resp_t resp,
+			       gnutls_datum_t * data);
+  int gnutls_ocsp_resp_print (gnutls_ocsp_resp_t resp,
+			      gnutls_ocsp_print_formats_t format,
+			      gnutls_datum_t * out);
+
+  int gnutls_ocsp_resp_get_status (gnutls_ocsp_resp_t resp);
+  int gnutls_ocsp_resp_get_response (gnutls_ocsp_resp_t resp,
+				     gnutls_datum_t *response_type_oid,
+				     gnutls_datum_t *response);
+
+  int gnutls_ocsp_resp_get_version (gnutls_ocsp_resp_t resp);
+  int gnutls_ocsp_resp_get_responder (gnutls_ocsp_resp_t resp,
+				      gnutls_datum_t *dn);
+  time_t gnutls_ocsp_resp_get_produced (gnutls_ocsp_resp_t resp);
+  int gnutls_ocsp_resp_get_single (gnutls_ocsp_resp_t resp,
+				   unsigned indx,
+				   gnutls_digest_algorithm_t *digest,
+				   gnutls_datum_t *issuer_name_hash,
+				   gnutls_datum_t *issuer_key_hash,
+				   gnutls_datum_t *serial_number,
+				   unsigned int *cert_status,
+				   time_t *this_update,
+				   time_t *next_update,
+				   time_t *revocation_time,
+				   unsigned int *revocation_reason);
+  int gnutls_ocsp_resp_get_extension (gnutls_ocsp_resp_t resp,
+				      unsigned indx,
+				      gnutls_datum_t *oid,
+				      unsigned int *critical,
+				      gnutls_datum_t *data);
+  int gnutls_ocsp_resp_get_nonce (gnutls_ocsp_resp_t resp,
+				  unsigned int *critical,
+				  gnutls_datum_t *nonce);
+  int gnutls_ocsp_resp_get_signature_algorithm (gnutls_ocsp_resp_t resp);
+  int gnutls_ocsp_resp_get_signature (gnutls_ocsp_resp_t resp,
+				      gnutls_datum_t *sig);
+  int gnutls_ocsp_resp_get_certs (gnutls_ocsp_resp_t resp,
+				  gnutls_x509_crt_t ** certs,
+				  size_t *ncerts);
+
+  int gnutls_ocsp_resp_verify_direct (gnutls_ocsp_resp_t resp,
+				      gnutls_x509_crt_t issuer,
+				      unsigned int *verify,
+				      unsigned int flags);
+  int gnutls_ocsp_resp_verify (gnutls_ocsp_resp_t resp,
+			       gnutls_x509_trust_list_t trustlist,
+			       unsigned int *verify,
+			       unsigned int flags);
+
+  int gnutls_ocsp_resp_check_crt (gnutls_ocsp_resp_t resp,
+                                  unsigned int indx,
+                                  gnutls_x509_crt_t crt);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* GNUTLS_OCSP_H */

data/vendor/local/include/gnutls/openpgp.h

@@ -1,13 +1,13 @@
 /*
- * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+ * Copyright (C) 2003-2012 Free Software Foundation, Inc.
  *
  * Author: Nikos Mavrogiannopoulos
  *
- * This file is part of GNUTLS.
+ * This file is part of GnuTLS.
  *
- * The GNUTLS library is free software; you can redistribute it and/or
+ * The GnuTLS is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
- * as published by the Free Software Foundation; either version 2.1 of
+ * as published by the Free Software Foundation; either version 3 of
  * the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful, but
@@ -15,10 +15,8 @@
  * 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
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
  *
  */
 
@@ -27,25 +25,35 @@
  */
 
 #ifndef GNUTLS_OPENPGP_H
-# define GNUTLS_OPENPGP_H
+#define GNUTLS_OPENPGP_H
+
+#include <gnutls/gnutls.h>
+#include <limits.h>
 
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
-#include <gnutls/gnutls.h>
-
-/* Openpgp certificate stuff 
+/* Openpgp certificate stuff
  */
 
+/**
+ * gnutls_openpgp_crt_fmt_t:
+ * @GNUTLS_OPENPGP_FMT_RAW: OpenPGP certificate in raw format.
+ * @GNUTLS_OPENPGP_FMT_BASE64: OpenPGP certificate in base64 format.
+ *
+ * Enumeration of different OpenPGP key formats.
+ */
   typedef enum gnutls_openpgp_crt_fmt
-  { GNUTLS_OPENPGP_FMT_RAW,
+  {
+    GNUTLS_OPENPGP_FMT_RAW,
     GNUTLS_OPENPGP_FMT_BASE64
   } gnutls_openpgp_crt_fmt_t;
 
-  typedef unsigned char gnutls_openpgp_keyid_t[8];
-    
+#define GNUTLS_OPENPGP_KEYID_SIZE 8
+  typedef unsigned char gnutls_openpgp_keyid_t[GNUTLS_OPENPGP_KEYID_SIZE];
+
 /* gnutls_openpgp_cert_t should be defined in gnutls.h
  */
 
@@ -55,34 +63,39 @@ extern "C"
   void gnutls_openpgp_crt_deinit (gnutls_openpgp_crt_t key);
 
   int gnutls_openpgp_crt_import (gnutls_openpgp_crt_t key,
-				 const gnutls_datum_t * data,
-				 gnutls_openpgp_crt_fmt_t format);
+                                 const gnutls_datum_t * data,
+                                 gnutls_openpgp_crt_fmt_t format);
   int gnutls_openpgp_crt_export (gnutls_openpgp_crt_t key,
-				 gnutls_openpgp_crt_fmt_t format,
-				 void *output_data,
-				 size_t * output_data_size);
+                                 gnutls_openpgp_crt_fmt_t format,
+                                 void *output_data,
+                                 size_t * output_data_size);
+  int gnutls_openpgp_crt_export2 (gnutls_openpgp_crt_t key,
+                                  gnutls_openpgp_crt_fmt_t format,
+                                  gnutls_datum_t * out);
 
   int gnutls_openpgp_crt_print (gnutls_openpgp_crt_t cert,
-		       gnutls_certificate_print_formats_t format,
-		       gnutls_datum_t *out);
+                                gnutls_certificate_print_formats_t format,
+                                gnutls_datum_t * out);
 
 /* The key_usage flags are defined in gnutls.h. They are
  * the GNUTLS_KEY_* definitions.
  */
-  int gnutls_openpgp_crt_get_key_usage (gnutls_openpgp_crt_t cert,
-					unsigned int *key_usage);
+#define GNUTLS_OPENPGP_MASTER_KEYID_IDX INT_MAX
+
+  int gnutls_openpgp_crt_get_key_usage (gnutls_openpgp_crt_t key,
+                                        unsigned int *key_usage);
   int gnutls_openpgp_crt_get_fingerprint (gnutls_openpgp_crt_t key, void *fpr,
-					  size_t * fprlen);
+                                          size_t * fprlen);
   int gnutls_openpgp_crt_get_subkey_fingerprint (gnutls_openpgp_crt_t key,
-						 unsigned int idx,
-						 void *fpr, size_t * fprlen);
+                                                 unsigned int idx,
+                                                 void *fpr, size_t * fprlen);
 
   int gnutls_openpgp_crt_get_name (gnutls_openpgp_crt_t key,
-				   int idx, char *buf, size_t * sizeof_buf);
+                                   int idx, char *buf, size_t * sizeof_buf);
 
-  gnutls_pk_algorithm_t
-  gnutls_openpgp_crt_get_pk_algorithm (gnutls_openpgp_crt_t key,
-				       unsigned int *bits);
+    gnutls_pk_algorithm_t
+    gnutls_openpgp_crt_get_pk_algorithm (gnutls_openpgp_crt_t key,
+                                         unsigned int *bits);
 
   int gnutls_openpgp_crt_get_version (gnutls_openpgp_crt_t key);
 
@@ -90,102 +103,168 @@ extern "C"
   time_t gnutls_openpgp_crt_get_expiration_time (gnutls_openpgp_crt_t key);
 
   int gnutls_openpgp_crt_get_key_id (gnutls_openpgp_crt_t key,
-				 gnutls_openpgp_keyid_t keyid);
+                                     gnutls_openpgp_keyid_t keyid);
 
   int gnutls_openpgp_crt_check_hostname (gnutls_openpgp_crt_t key,
-					 const char *hostname);
+                                         const char *hostname);
 
   int gnutls_openpgp_crt_get_revoked_status (gnutls_openpgp_crt_t key);
 
   int gnutls_openpgp_crt_get_subkey_count (gnutls_openpgp_crt_t key);
-  int gnutls_openpgp_crt_get_subkey_idx (gnutls_openpgp_crt_t key, const gnutls_openpgp_keyid_t keyid);
-  int gnutls_openpgp_crt_get_subkey_revoked_status (gnutls_openpgp_crt_t key, unsigned int idx);
-  gnutls_pk_algorithm_t gnutls_openpgp_crt_get_subkey_pk_algorithm (gnutls_openpgp_crt_t key,
-    unsigned int idx, unsigned int *bits);
-  time_t gnutls_openpgp_crt_get_subkey_creation_time (gnutls_openpgp_crt_t key, unsigned int idx);
-  time_t gnutls_openpgp_crt_get_subkey_expiration_time (gnutls_openpgp_crt_t key, unsigned int idx);
-  int gnutls_openpgp_crt_get_subkey_id (gnutls_openpgp_crt_t key, unsigned int idx, gnutls_openpgp_keyid_t keyid);
-  int gnutls_openpgp_crt_get_subkey_usage (gnutls_openpgp_crt_t key, unsigned int idx,
-				  unsigned int *key_usage);
-
-  int gnutls_openpgp_crt_get_subkey_pk_dsa_raw (gnutls_openpgp_crt_t crt, unsigned int idx,
-				gnutls_datum_t * p, gnutls_datum_t * q,
-				gnutls_datum_t * g, gnutls_datum_t * y);
-  int gnutls_openpgp_crt_get_subkey_pk_rsa_raw (gnutls_openpgp_crt_t crt, unsigned int idx,
-				gnutls_datum_t * m, gnutls_datum_t * e);
-  int gnutls_openpgp_crt_get_pk_dsa_raw (gnutls_openpgp_crt_t crt, 
-				gnutls_datum_t * p, gnutls_datum_t * q,
-				gnutls_datum_t * g, gnutls_datum_t * y);
-  int gnutls_openpgp_crt_get_pk_rsa_raw (gnutls_openpgp_crt_t crt, 
-				gnutls_datum_t * m, gnutls_datum_t * e);
-
-  int gnutls_openpgp_crt_get_preferred_key_id (gnutls_openpgp_crt_t key, gnutls_openpgp_keyid_t keyid);
-  int gnutls_openpgp_crt_set_preferred_key_id (gnutls_openpgp_crt_t key, const gnutls_openpgp_keyid_t keyid);
+  int gnutls_openpgp_crt_get_subkey_idx (gnutls_openpgp_crt_t key,
+                                         const gnutls_openpgp_keyid_t keyid);
+  int gnutls_openpgp_crt_get_subkey_revoked_status (gnutls_openpgp_crt_t key,
+                                                    unsigned int idx);
+    gnutls_pk_algorithm_t
+    gnutls_openpgp_crt_get_subkey_pk_algorithm (gnutls_openpgp_crt_t key,
+                                                unsigned int idx,
+                                                unsigned int *bits);
+  time_t gnutls_openpgp_crt_get_subkey_creation_time (gnutls_openpgp_crt_t
+                                                      key, unsigned int idx);
+  time_t gnutls_openpgp_crt_get_subkey_expiration_time (gnutls_openpgp_crt_t
+                                                        key,
+                                                        unsigned int idx);
+  int gnutls_openpgp_crt_get_subkey_id (gnutls_openpgp_crt_t key,
+                                        unsigned int idx,
+                                        gnutls_openpgp_keyid_t keyid);
+  int gnutls_openpgp_crt_get_subkey_usage (gnutls_openpgp_crt_t key,
+                                           unsigned int idx,
+                                           unsigned int *key_usage);
+
+  int gnutls_openpgp_crt_get_subkey_pk_dsa_raw (gnutls_openpgp_crt_t crt,
+                                                unsigned int idx,
+                                                gnutls_datum_t * p,
+                                                gnutls_datum_t * q,
+                                                gnutls_datum_t * g,
+                                                gnutls_datum_t * y);
+  int gnutls_openpgp_crt_get_subkey_pk_rsa_raw (gnutls_openpgp_crt_t crt,
+                                                unsigned int idx,
+                                                gnutls_datum_t * m,
+                                                gnutls_datum_t * e);
+  int gnutls_openpgp_crt_get_pk_dsa_raw (gnutls_openpgp_crt_t crt,
+                                         gnutls_datum_t * p,
+                                         gnutls_datum_t * q,
+                                         gnutls_datum_t * g,
+                                         gnutls_datum_t * y);
+  int gnutls_openpgp_crt_get_pk_rsa_raw (gnutls_openpgp_crt_t crt,
+                                         gnutls_datum_t * m,
+                                         gnutls_datum_t * e);
+
+  int gnutls_openpgp_crt_get_preferred_key_id (gnutls_openpgp_crt_t key,
+                                               gnutls_openpgp_keyid_t keyid);
+  int
+    gnutls_openpgp_crt_set_preferred_key_id (gnutls_openpgp_crt_t key,
+                                             const gnutls_openpgp_keyid_t
+                                             keyid);
 
 /* privkey stuff.
  */
   int gnutls_openpgp_privkey_init (gnutls_openpgp_privkey_t * key);
   void gnutls_openpgp_privkey_deinit (gnutls_openpgp_privkey_t key);
-  gnutls_pk_algorithm_t
-  gnutls_openpgp_privkey_get_pk_algorithm (gnutls_openpgp_privkey_t key,
-					   unsigned int *bits);
+    gnutls_pk_algorithm_t
+    gnutls_openpgp_privkey_get_pk_algorithm (gnutls_openpgp_privkey_t key,
+                                             unsigned int *bits);
+
+    gnutls_sec_param_t
+    gnutls_openpgp_privkey_sec_param (gnutls_openpgp_privkey_t key);
   int gnutls_openpgp_privkey_import (gnutls_openpgp_privkey_t key,
-				     const gnutls_datum_t * data,
-				     gnutls_openpgp_crt_fmt_t format,
-				     const char *pass, unsigned int flags);
-  int gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
-				  const gnutls_datum_t * hash,
-				  gnutls_datum_t * signature);
+                                     const gnutls_datum_t * data,
+                                     gnutls_openpgp_crt_fmt_t format,
+                                     const char *password,
+                                     unsigned int flags);
+
   int gnutls_openpgp_privkey_get_fingerprint (gnutls_openpgp_privkey_t key,
-				    void *fpr, size_t * fprlen);
-  int
-  gnutls_openpgp_privkey_get_subkey_fingerprint (gnutls_openpgp_privkey_t key,
-						 unsigned int idx,
-						 void *fpr, size_t * fprlen);
-  int gnutls_openpgp_privkey_get_key_id (gnutls_openpgp_privkey_t key, gnutls_openpgp_keyid_t keyid);
+                                              void *fpr, size_t * fprlen);
+  int gnutls_openpgp_privkey_get_subkey_fingerprint (gnutls_openpgp_privkey_t
+                                                     key, unsigned int idx,
+                                                     void *fpr,
+                                                     size_t * fprlen);
+  int gnutls_openpgp_privkey_get_key_id (gnutls_openpgp_privkey_t key,
+                                         gnutls_openpgp_keyid_t keyid);
   int gnutls_openpgp_privkey_get_subkey_count (gnutls_openpgp_privkey_t key);
-  int gnutls_openpgp_privkey_get_subkey_idx (gnutls_openpgp_privkey_t key, const gnutls_openpgp_keyid_t keyid);
-
-  int gnutls_openpgp_privkey_get_subkey_revoked_status (gnutls_openpgp_privkey_t key, unsigned int idx);
+  int gnutls_openpgp_privkey_get_subkey_idx (gnutls_openpgp_privkey_t key,
+                                             const gnutls_openpgp_keyid_t
+                                             keyid);
 
-  int gnutls_openpgp_privkey_get_revoked_status (gnutls_openpgp_privkey_t key);
+  int
+    gnutls_openpgp_privkey_get_subkey_revoked_status (gnutls_openpgp_privkey_t
+                                                      key, unsigned int idx);
 
-  gnutls_pk_algorithm_t gnutls_openpgp_privkey_get_subkey_pk_algorithm (gnutls_openpgp_privkey_t key,
-    unsigned int idx, unsigned int *bits);
+  int gnutls_openpgp_privkey_get_revoked_status (gnutls_openpgp_privkey_t
+                                                 key);
 
-  time_t gnutls_openpgp_privkey_get_subkey_expiration_time (gnutls_openpgp_privkey_t key, unsigned int idx);
+    gnutls_pk_algorithm_t
+    gnutls_openpgp_privkey_get_subkey_pk_algorithm (gnutls_openpgp_privkey_t
+                                                    key, unsigned int idx,
+                                                    unsigned int *bits);
 
-  int gnutls_openpgp_privkey_get_subkey_id (gnutls_openpgp_privkey_t key, unsigned int idx, gnutls_openpgp_keyid_t keyid);
+    time_t
+    gnutls_openpgp_privkey_get_subkey_expiration_time
+    (gnutls_openpgp_privkey_t key, unsigned int idx);
 
-  time_t gnutls_openpgp_privkey_get_subkey_creation_time (gnutls_openpgp_privkey_t key, unsigned int idx);
+  int gnutls_openpgp_privkey_get_subkey_id (gnutls_openpgp_privkey_t key,
+                                            unsigned int idx,
+                                            gnutls_openpgp_keyid_t keyid);
 
-  int gnutls_openpgp_privkey_export_subkey_dsa_raw (gnutls_openpgp_privkey_t crt, unsigned int idx,
-				    gnutls_datum_t * p, gnutls_datum_t * q,
-				    gnutls_datum_t * g, gnutls_datum_t * y,
-				    gnutls_datum_t * x);
-  int gnutls_openpgp_privkey_export_subkey_rsa_raw (gnutls_openpgp_privkey_t crt, unsigned int idx,
-				    gnutls_datum_t * m, gnutls_datum_t * e,
-				    gnutls_datum_t * d, gnutls_datum_t * p,
-				    gnutls_datum_t * q, gnutls_datum_t * u);
+    time_t
+    gnutls_openpgp_privkey_get_subkey_creation_time (gnutls_openpgp_privkey_t
+                                                     key, unsigned int idx);
 
-  int gnutls_openpgp_privkey_export_dsa_raw (gnutls_openpgp_privkey_t crt, 
-				    gnutls_datum_t * p, gnutls_datum_t * q,
-				    gnutls_datum_t * g, gnutls_datum_t * y,
-				    gnutls_datum_t * x);
-  int gnutls_openpgp_privkey_export_rsa_raw (gnutls_openpgp_privkey_t crt, 
-				    gnutls_datum_t * m, gnutls_datum_t * e,
-				    gnutls_datum_t * d, gnutls_datum_t * p,
-				    gnutls_datum_t * q, gnutls_datum_t * u);
+  int
+    gnutls_openpgp_privkey_export_subkey_dsa_raw (gnutls_openpgp_privkey_t
+                                                  pkey, unsigned int idx,
+                                                  gnutls_datum_t * p,
+                                                  gnutls_datum_t * q,
+                                                  gnutls_datum_t * g,
+                                                  gnutls_datum_t * y,
+                                                  gnutls_datum_t * x);
+  int gnutls_openpgp_privkey_export_subkey_rsa_raw (gnutls_openpgp_privkey_t
+                                                    pkey, unsigned int idx,
+                                                    gnutls_datum_t * m,
+                                                    gnutls_datum_t * e,
+                                                    gnutls_datum_t * d,
+                                                    gnutls_datum_t * p,
+                                                    gnutls_datum_t * q,
+                                                    gnutls_datum_t * u);
+
+  int gnutls_openpgp_privkey_export_dsa_raw (gnutls_openpgp_privkey_t pkey,
+                                             gnutls_datum_t * p,
+                                             gnutls_datum_t * q,
+                                             gnutls_datum_t * g,
+                                             gnutls_datum_t * y,
+                                             gnutls_datum_t * x);
+  int gnutls_openpgp_privkey_export_rsa_raw (gnutls_openpgp_privkey_t pkey,
+                                             gnutls_datum_t * m,
+                                             gnutls_datum_t * e,
+                                             gnutls_datum_t * d,
+                                             gnutls_datum_t * p,
+                                             gnutls_datum_t * q,
+                                             gnutls_datum_t * u);
 
   int gnutls_openpgp_privkey_export (gnutls_openpgp_privkey_t key,
-			   gnutls_openpgp_crt_fmt_t format,
-			   const char* password, unsigned int flags,
-			   void *output_data, size_t * output_data_size);
+                                     gnutls_openpgp_crt_fmt_t format,
+                                     const char *password,
+                                     unsigned int flags,
+                                     void *output_data,
+                                     size_t * output_data_size);
+  int gnutls_openpgp_privkey_export2 (gnutls_openpgp_privkey_t key,
+                                      gnutls_openpgp_crt_fmt_t format,
+                                      const char *password,
+                                      unsigned int flags,
+                                      gnutls_datum_t * out);
 
-  int gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t key, const gnutls_openpgp_keyid_t keyid);
-  int gnutls_openpgp_privkey_get_preferred_key_id (gnutls_openpgp_privkey_t key, gnutls_openpgp_keyid_t keyid);
-  
-  int gnutls_openpgp_crt_get_auth_subkey( gnutls_openpgp_crt_t crt, gnutls_openpgp_keyid_t keyid, unsigned int flag);
+  int
+    gnutls_openpgp_privkey_set_preferred_key_id (gnutls_openpgp_privkey_t key,
+                                                 const gnutls_openpgp_keyid_t
+                                                 keyid);
+  int gnutls_openpgp_privkey_get_preferred_key_id (gnutls_openpgp_privkey_t
+                                                   key,
+                                                   gnutls_openpgp_keyid_t
+                                                   keyid);
+
+  int gnutls_openpgp_crt_get_auth_subkey (gnutls_openpgp_crt_t crt,
+                                          gnutls_openpgp_keyid_t keyid,
+                                          unsigned int flag);
 
 /* Keyring stuff.
  */
@@ -194,32 +273,33 @@ extern "C"
   void gnutls_openpgp_keyring_deinit (gnutls_openpgp_keyring_t keyring);
 
   int gnutls_openpgp_keyring_import (gnutls_openpgp_keyring_t keyring,
-				     const gnutls_datum_t * data,
-				     gnutls_openpgp_crt_fmt_t format);
+                                     const gnutls_datum_t * data,
+                                     gnutls_openpgp_crt_fmt_t format);
 
   int gnutls_openpgp_keyring_check_id (gnutls_openpgp_keyring_t ring,
-				       const gnutls_openpgp_keyid_t keyid,
-				       unsigned int flags);
+                                       const gnutls_openpgp_keyid_t keyid,
+                                       unsigned int flags);
 
 
   int gnutls_openpgp_crt_verify_ring (gnutls_openpgp_crt_t key,
-				      gnutls_openpgp_keyring_t keyring,
-				      unsigned int flags, unsigned int *verify
-				      /* the output of the verification */ );
+                                      gnutls_openpgp_keyring_t keyring,
+                                      unsigned int flags, unsigned int *verify
+                                      /* the output of the verification */ );
 
   int gnutls_openpgp_crt_verify_self (gnutls_openpgp_crt_t key,
-				      unsigned int flags,
-				      unsigned int *verify);
+                                      unsigned int flags,
+                                      unsigned int *verify);
 
-  int gnutls_openpgp_keyring_get_crt (gnutls_openpgp_keyring_t ring, unsigned int idx, 
-    gnutls_openpgp_crt_t* cert);
+  int gnutls_openpgp_keyring_get_crt (gnutls_openpgp_keyring_t ring,
+                                      unsigned int idx,
+                                      gnutls_openpgp_crt_t * cert);
 
   int gnutls_openpgp_keyring_get_crt_count (gnutls_openpgp_keyring_t ring);
 
 
 
 /**
- * gnutls_openpgp_recv_key_func - Callback prototype to get OpenPGP keys
+ * gnutls_openpgp_recv_key_func:
  * @session: a TLS session
  * @keyfpr: key fingerprint
  * @keyfpr_length: length of key fingerprint
@@ -230,54 +310,62 @@ extern "C"
  * fingerprint instead of a full key.  See also
  * gnutls_openpgp_set_recv_key_function().
  *
+ * Returns: On success, %GNUTLS_E_SUCCESS (zero) is returned,
+ *   otherwise an error code is returned.
  */
   typedef int (*gnutls_openpgp_recv_key_func) (gnutls_session_t session,
-					       const unsigned char *keyfpr,
-					       unsigned int keyfpr_length,
-					       gnutls_datum_t * key);
+                                               const unsigned char *keyfpr,
+                                               unsigned int keyfpr_length,
+                                               gnutls_datum_t * key);
 
-  void gnutls_openpgp_set_recv_key_function (gnutls_session_t session,
-					     gnutls_openpgp_recv_key_func
-					     func);
+  void
+    gnutls_openpgp_set_recv_key_function (gnutls_session_t session,
+                                          gnutls_openpgp_recv_key_func func);
 
 
 
 /* certificate authentication stuff.
  */
-  int gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t
-					  res, gnutls_openpgp_crt_t key,
-					  gnutls_openpgp_privkey_t pkey);
+  int gnutls_certificate_set_openpgp_key (gnutls_certificate_credentials_t res,
+					  gnutls_openpgp_crt_t crt,
+                                          gnutls_openpgp_privkey_t pkey);
 
   int
     gnutls_certificate_set_openpgp_key_file (gnutls_certificate_credentials_t
-					     res, const char *CERTFILE,
-					     const char *KEYFILE, gnutls_openpgp_crt_fmt_t);
+                                             res, const char *certfile,
+                                             const char *keyfile,
+                                             gnutls_openpgp_crt_fmt_t format);
   int gnutls_certificate_set_openpgp_key_mem (gnutls_certificate_credentials_t
-					      res,
-					      const gnutls_datum_t * CERT,
-					      const gnutls_datum_t * KEY, gnutls_openpgp_crt_fmt_t);
-
-  int gnutls_certificate_set_openpgp_key_file2 (gnutls_certificate_credentials_t
-					     res, const char *CERTFILE,
-					     const char *KEYFILE, const char* keyid, 
-					     gnutls_openpgp_crt_fmt_t);
-  int gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t
-					      res,
-					      const gnutls_datum_t * CERT,
-					      const gnutls_datum_t * KEY, 
-					      const char* keyid, 
-					      gnutls_openpgp_crt_fmt_t);
+                                              res,
+                                              const gnutls_datum_t * cert,
+                                              const gnutls_datum_t * key,
+                                              gnutls_openpgp_crt_fmt_t
+                                              format);
 
   int
-    gnutls_certificate_set_openpgp_keyring_mem
-    (gnutls_certificate_credentials_t c, const unsigned char *data,
-     size_t dlen, gnutls_openpgp_crt_fmt_t);
-
+    gnutls_certificate_set_openpgp_key_file2 (gnutls_certificate_credentials_t
+                                              res, const char *certfile,
+                                              const char *keyfile,
+                                              const char *subkey_id,
+                                              gnutls_openpgp_crt_fmt_t
+                                              format);
   int
-    gnutls_certificate_set_openpgp_keyring_file
-    (gnutls_certificate_credentials_t c, const char *file, gnutls_openpgp_crt_fmt_t);
+    gnutls_certificate_set_openpgp_key_mem2 (gnutls_certificate_credentials_t
+                                             res, const gnutls_datum_t * cert,
+                                             const gnutls_datum_t * key,
+                                             const char *subkey_id,
+                                             gnutls_openpgp_crt_fmt_t format);
+
+  int gnutls_certificate_set_openpgp_keyring_mem (
+   gnutls_certificate_credentials_t c, const unsigned char *data,
+   size_t dlen, gnutls_openpgp_crt_fmt_t format);
+
+  int gnutls_certificate_set_openpgp_keyring_file (
+   gnutls_certificate_credentials_t c, const char *file,
+   gnutls_openpgp_crt_fmt_t format);
 
 #ifdef __cplusplus
 }
 #endif
-#endif				/* GNUTLS_OPENPGP_H */
+
+#endif                          /* GNUTLS_OPENPGP_H */