On Feb 6, 11:10am, m...@netbsd.org (m...@netbsd.org) wrote: -- Subject: Re: CVS commit: src/crypto/external/bsd/openssh/dist
| On Sun, Feb 04, 2018 at 07:13:50PM -0500, Christos Zoulas wrote: | > - return BN_num_bits(k->rsa->n); | > +#if OPENSSL_VERSION_NUMBER >= 0x10100000UL | > + return RSA_bits(k->rsa); | > +#else | > + return BN_num_bits(k->rsa->p); | > +#endif | > case KEY_DSA: | > case KEY_DSA_CERT: | > +#if OPENSSL_VERSION_NUMBER >= 0x10100000UL | > + return DSA_bits(k->dsa); | > +#else | > return BN_num_bits(k->dsa->p); | > +#endif | | you put RSA_bits in openssl.old, can use it directly instead of macros? Yes, it seems that the linux patch was done by different people; some tried to maintain backwards compatibility, others did not. I guess the remaining 4 ifdefs in sshkey.c can be removed since the code is already using 1.1 functions unconditionally elsewhere. Please test before you commit if you do this. christos
