Now OpenPGP uses its own context for DN.

diff --git a/lib/gnutls_openpgp.c b/lib/gnutls_openpgp.c
index 84de435feff51ecd03983b06d28be5ec70d131d9..ecebc32d81688b0cc937a2d8b411edb1b3477cbf 100644 (file)
--- a/lib/gnutls_openpgp.c
+++ b/lib/gnutls_openpgp.c
@@ -575,7 +575,7 @@ leave:
  **/
 int
 gnutls_openpgp_extract_certificate_dn( const gnutls_datum *cert,
-                                       gnutls_dn *dn )
+                                       gnutls_openpgp_name *dn )
 {
   PKT pkt = NULL;
   PKT_userid *uid = NULL;
@@ -593,8 +593,9 @@ gnutls_openpgp_extract_certificate_dn( const gnutls_datum *cert,
     {
       rc = GNUTLS_E_UNKNOWN_ERROR;
       goto leave;
-    }    
-  strcpy( dn->common_name, uid->name );
+    }
+  memset(dn, 0, sizeof *dn);
+  strcpy( dn->name, uid->name );
 
   /*
    * Extract the email address from the userID string and save it to

diff --git a/lib/gnutls_openpgp.h b/lib/gnutls_openpgp.h
index 3ceb67c6ef8ccb984e4f1bef8eef7f55cac37a68..6f1987a50e99dc162f021550a4569cf9598c0651 100644 (file)
--- a/lib/gnutls_openpgp.h
+++ b/lib/gnutls_openpgp.h
@@ -6,7 +6,7 @@ int gnutls_certificate_set_openpgp_key_file(
                                             char* CERTFILE,
                                             char* KEYFILE);
 int gnutls_openpgp_extract_certificate_dn( const gnutls_datum *cert,
-                                                  gnutls_dn *dn);
+                                                  gnutls_openpgp_name *dn);
 int gnutls_openpgp_extract_certificate_version( const gnutls_datum *cert );
 time_t gnutls_openpgp_extract_certificate_activation_time(
                                                           const gnutls_datum

diff --git a/lib/gnutls_ui.h b/lib/gnutls_ui.h
index 78a3a0932faa034f90d4d3194867887477cffb57..a6346cfd57aef3ab254d67a7037fa760191c7c44 100644 (file)
--- a/lib/gnutls_ui.h
+++ b/lib/gnutls_ui.h
@@ -23,6 +23,11 @@ typedef struct {
 } gnutls_x509_dn;
 #define gnutls_DN gnutls_x509_dn
 
+typedef struct {
+       char name[GNUTLS_X509_CN_SIZE];
+       char email[GNUTLS_X509_CN_SIZE];
+} gnutls_openpgp_name; 
+
 /* For key Usage, test as:
  * if (st.keyUsage & X509KEY_DIGITAL_SIGNATURE) ...
  */