[gnutls-dev] Fixing OpenPGP keyring import

[Simon Josefsson]

Timo Schulz <twoaday at gmx.net> writes:

>> I think it may better not to back-port this stuff to the nmav branch.
>> Let's aim for GnuTLS changing to use OpenCDK HEAD instead.
>
> That's exactly my position. This avoids to double mantain two branches
> and it probably fixes other problems.

Agreed.

>> now, and we can aim for 1.7.9 to mostly just do the OpenCDK upgrade.
>> I do want to have HEAD in a buildable stage for most of the time, so
>> if you think you'll need more than a few days of time to finish the
>> migration, let's create a branch for it.  What do you think?
>
> Hmm, first I need to check how much code I would need to change and how
> fast I can test the changes. But I don't think it will take longer than
> 2-3 days. I actually hope <= 2 days but I need to check the code first.

Great, feel free to install on GnuTLS HEAD.  I don't expect 1.7.9 to
take as long as 1.7.8 was to release, but I'm thinking maybe one month
at most.

> I attached the patch, but if we do the upgrade now (or better soon as
> possible), it is not needed because the OpenCDK HEAD fixes the problem.
>
> --- /tmp/keydb.c	2007-04-18 19:40:43.000000000 +0200
> +++ keydb.c	2007-04-18 19:42:31.000000000 +0200
> @@ -263,6 +263,8 @@
>              cdk_free( hd );
>              return CDK_Out_Of_Core;
>          }
> +	if( cdk_armor_filter_use( hd->buf ) )
> +	    cdk_stream_set_armor_flag( hd->buf, 0 );	
>          break;
>  
>      default:

Ludovic, would you like to see this go in now, so you can continue
working without a patched GnuTLS?  Assuming of course that you believe
the patch will solve your problem.

Alternatively, wait for Timo's gnutls-changes to use the new OpenCDK
(and possibly run into new bugs).

/Simon