generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

openssl: remove #ifdefs for < 0.9.5 support

Browse Source 
We only support >= 0.9.7
This commit is contained in:
Daniel Stenberg 2015-11-13 15:49:49 +01:00
parent 431ba85829
commit 53b13d0c71
1 changed files with 29 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
lib/vtls/openssl.c
View File

@ -2950,72 +2950,41 @@ size_t Curl_ossl_version(char *buffer, size_t size)
#ifdef OPENSSL_IS_BORINGSSL #ifdef OPENSSL_IS_BORINGSSL
return snprintf(buffer, size, "BoringSSL"); return snprintf(buffer, size, "BoringSSL");
#else /* OPENSSL_IS_BORINGSSL */ #else /* OPENSSL_IS_BORINGSSL */
char sub[3];
#if(OPENSSL_VERSION_NUMBER >= 0x905000) unsigned long ssleay_value;
{ sub[2]='\0';
char sub[3]; sub[1]='\0';
unsigned long ssleay_value; ssleay_value=SSLeay();
sub[2]='\0'; if(ssleay_value < 0x906000) {
sub[1]='\0'; ssleay_value=SSLEAY_VERSION_NUMBER;
ssleay_value=SSLeay(); sub[0]='\0';
if(ssleay_value < 0x906000) {
ssleay_value=SSLEAY_VERSION_NUMBER;
sub[0]='\0';
}
else {
if(ssleay_value&0xff0) {
int minor_ver = (ssleay_value >> 4) & 0xff;
if(minor_ver > 26) {
/* handle extended version introduced for 0.9.8za */
sub[1] = (char) ((minor_ver - 1) % 26 + 'a' + 1);
sub[0] = 'z';
}
else {
sub[0]=(char)(((ssleay_value>>4)&0xff) + 'a' -1);
}
}
else
sub[0]='\0';
}
return snprintf(buffer, size, "%s/%lx.%lx.%lx%s",
#ifdef LIBRESSL_VERSION_NUMBER
"LibreSSL"
#else
"OpenSSL"
#endif
, (ssleay_value>>28)&0xf,
(ssleay_value>>20)&0xff,
(ssleay_value>>12)&0xff,
sub);
} }
else {
#else /* OPENSSL_VERSION_NUMBER is less than 0.9.5 */ if(ssleay_value&0xff0) {
int minor_ver = (ssleay_value >> 4) & 0xff;
#if(OPENSSL_VERSION_NUMBER >= 0x900000) if(minor_ver > 26) {
return snprintf(buffer, size, "OpenSSL/%lx.%lx.%lx", /* handle extended version introduced for 0.9.8za */
(OPENSSL_VERSION_NUMBER>>28)&0xff, sub[1] = (char) ((minor_ver - 1) % 26 + 'a' + 1);
(OPENSSL_VERSION_NUMBER>>20)&0xff, sub[0] = 'z';
(OPENSSL_VERSION_NUMBER>>12)&0xf); }
else {
#else /* (OPENSSL_VERSION_NUMBER >= 0x900000) */ sub[0]=(char)(((ssleay_value>>4)&0xff) + 'a' -1);
{ }
char sub[2];
sub[1]='\0';
if(OPENSSL_VERSION_NUMBER&0x0f) {
sub[0]=(OPENSSL_VERSION_NUMBER&0x0f) + 'a' -1;
} }
else else
sub[0]='\0'; 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 */
return snprintf(buffer, size, "%s/%lx.%lx.%lx%s",
#ifdef LIBRESSL_VERSION_NUMBER
"LibreSSL"
#else
"OpenSSL"
#endif
, (ssleay_value>>28)&0xf,
(ssleay_value>>20)&0xff,
(ssleay_value>>12)&0xff,
sub);
#endif /* OPENSSL_IS_BORINGSSL */ #endif /* OPENSSL_IS_BORINGSSL */
} }