Re: [Monotone-devel] nvm.stripped & botan on FreeBSD [Was: propose to land .stripped on Tuesday]

[Zack Weinberg]

On Mon, Feb 16, 2009 at 1:04 AM, Lapo Luchini <address@hidden> wrote:
>> migrate_ancestry.cc: In member function
>> 'void<unnamed>::anc_graph::write_certs()':
>> migrate_ancestry.cc:198: error: 'class key_store' has no member named
>> 'get_rng'
>
> Seems to be because:
>
> key_store.hh:46 #if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7)
> key_store.hh:47   Botan::RandomNumberGenerator & get_rng();
> key_store.hh:48 #endif
>
> while migrate_ancestry.cc:198 uses it unconditionally, and FreeBSD
> Ports' botan is still at 1.6.5…

This is the danger of moving huge blocks of code around, I guess ...
there *was* appropriate #ifdeffage in the previous incarnation of this
code on .stripped, in revision.cc, but I did the reorganization on
mainline.  Please try replacing line 198 of revision.cc with this
code:

#if BOTAN_VERSION_CODE >= BOTAN_VERSION_CODE_FOR(1,7,7)
        keys.get_rng().randomize(reinterpret_cast<Botan::byte *>(buf),
                                 constants::epochlen_bytes);
#else
        Botan::Global_RNG::randomize(reinterpret_cast<Botan::byte *>(buf),
                                     constants::epochlen_bytes);
#endif

(that's taken directly from rev 7aa69891001cc53af518ca9bff8e1c7dae0c280d).

zw