*** empty log message ***

diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c
index 1128bf8ee53d5b83d0642d5c520c04b6927058d6..67321f182fb5a21725ae14dd3a386f633ad027b0 100644 (file)
--- a/libextra/gnutls_openpgp.c
+++ b/libextra/gnutls_openpgp.c
@@ -446,11 +446,6 @@ _gnutls_openpgp_key2gnutls_key( gnutls_private_key *pkey,
         pkey->pk_algorithm = GNUTLS_PK_DSA;
     else if( is_RSA(pke_algo) )
         pkey->pk_algorithm = GNUTLS_PK_RSA;
-    rc = _gnutls_set_datum( &pkey->raw, raw_key->data, raw_key->size );
-    if( rc < 0 ) {
-        release_mpi_array( pkey->params, i );
-        rc = GNUTLS_E_MEMORY_ERROR;
-    }
 
 leave:
     cdk_stream_close( out );

diff --git a/src/common.c b/src/common.c
index 2467768b0de0c8acdb09aa2e0f313373da0e7566..d80ecabf1fa3c0783332806028fa6b35d8de182d 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -55,6 +55,7 @@ void print_x509_info(gnutls_session session)
        if (cert_list_size <= 0)
                return;
 
+#if 0 /* FIXME */
        if (xml) {
                gnutls_datum res;
 
@@ -65,6 +66,7 @@ void print_x509_info(gnutls_session session)
 
                return;
        }
+#endif
 
        printf(" - Certificate info:\n");
 
@@ -163,6 +165,7 @@ void print_openpgp_info(gnutls_session session)
        if (cert_list_size > 0) {
                int algo, bits;
 
+#if 0
                if (xml) {
                        gnutls_datum res;
 
@@ -173,6 +176,7 @@ void print_openpgp_info(gnutls_session session)
 
                        return;
                }
+#endif
 
                printf(" # Key was created at: %s", my_ctime(&activet));
                printf(" # Key expires: ");