Commit 53b13d0c authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

openssl: remove #ifdefs for < 0.9.5 support 

We only support >= 0.9.7
parent 431ba858

lib/vtls/openssl.c

+29 −60
Original line number Diff line number Diff line
@@ -2950,9 +2950,6 @@ size_t Curl_ossl_version(char *buffer, size_t size) 
#ifdef OPENSSL_IS_BORINGSSL

  return snprintf(buffer, size, "BoringSSL");

#else /* OPENSSL_IS_BORINGSSL */



#if(OPENSSL_VERSION_NUMBER >= 0x905000)

  {

  char sub[3];

  unsigned long ssleay_value;

  sub[2]='\0';
@@ -2988,34 +2985,6 @@ size_t Curl_ossl_version(char *buffer, size_t size) 
                  (ssleay_value>>20)&0xff,

                  (ssleay_value>>12)&0xff,

                  sub);

  }



#else /* OPENSSL_VERSION_NUMBER is less than 0.9.5 */



#if(OPENSSL_VERSION_NUMBER >= 0x900000)

  return snprintf(buffer, size, "OpenSSL/%lx.%lx.%lx",

                  (OPENSSL_VERSION_NUMBER>>28)&0xff,

                  (OPENSSL_VERSION_NUMBER>>20)&0xff,

                  (OPENSSL_VERSION_NUMBER>>12)&0xf);



#else /* (OPENSSL_VERSION_NUMBER >= 0x900000) */

  {

    char sub[2];

    sub[1]='\0';

    if(OPENSSL_VERSION_NUMBER&0x0f) {

      sub[0]=(OPENSSL_VERSION_NUMBER&0x0f) + 'a' -1;

    }

    else

      sub[0]='\0';



    return snprintf(buffer, size, "SSL/%x.%x.%x%s",

                    (OPENSSL_VERSION_NUMBER>>12)&0xff,

                    (OPENSSL_VERSION_NUMBER>>8)&0xf,

                    (OPENSSL_VERSION_NUMBER>>4)&0xf, sub);

  }

#endif /* (OPENSSL_VERSION_NUMBER >= 0x900000) */

#endif /* OPENSSL_VERSION_NUMBER is less than 0.9.5 */



#endif /* OPENSSL_IS_BORINGSSL */

}