View | Details | Raw Unified | Return to bug 259688 | Differences between
and this patch

Collapse All | Expand All

(-)memcached.c (-3 / +3 lines)
Lines 4013-4020 static void usage(void) { Link Here
4013
    printf("   - ssl_session_cache:   enable server-side SSL session cache, to support session\n"
4013
    printf("   - ssl_session_cache:   enable server-side SSL session cache, to support session\n"
4014
           "                          resumption\n"
4014
           "                          resumption\n"
4015
           "   - ssl_min_version:     minimum protocol version to accept (default: %s)\n"
4015
           "   - ssl_min_version:     minimum protocol version to accept (default: %s)\n"
4016
#if OPENSSL_VERSION_NUMBER >= 0x10101000L
4016
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER > 0x3040000fL)
4017
           "                          valid values are 0(%s), 1(%s), 2(%s), or 3(%s).\n",
4017
	   "                          valid values are 0(%s), 1(%s), 2(%s), or 3(%s).\n",
4018
           ssl_proto_text(settings.ssl_min_version),
4018
           ssl_proto_text(settings.ssl_min_version),
4019
           ssl_proto_text(TLS1_VERSION), ssl_proto_text(TLS1_1_VERSION),
4019
           ssl_proto_text(TLS1_VERSION), ssl_proto_text(TLS1_1_VERSION),
4020
           ssl_proto_text(TLS1_2_VERSION), ssl_proto_text(TLS1_3_VERSION));
4020
           ssl_proto_text(TLS1_2_VERSION), ssl_proto_text(TLS1_3_VERSION));
Lines 5413-5419 int main (int argc, char **argv) { Link Here
5413
                    case 2:
5413
                    case 2:
5414
                        settings.ssl_min_version = TLS1_2_VERSION;
5414
                        settings.ssl_min_version = TLS1_2_VERSION;
5415
                        break;
5415
                        break;
5416
#if OPENSSL_VERSION_NUMBER >= 0x10101000L
5416
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) || (LIBRESSL_VERSION_NUMBER >= 0x3040000fL)
5417
                    case 3:
5417
                    case 3:
5418
                        settings.ssl_min_version = TLS1_3_VERSION;
5418
                        settings.ssl_min_version = TLS1_3_VERSION;
5419
                        break;
5419
                        break;

Return to bug 259688