Use the same configure options etc. for both builds (no need for the cert options as we don't use TLS or X.509 parsing) and switch to a Git commit that includes the SHA-3 OID fix (it's actually the fix itself).