fix build with no-srtp
- srtp_profiles variable is defined when building with SRTP, keeping the variable usage also under ifndef OPENSSL_NO_SRTP - alpn help option was kept under ifndef OPENSSL_NO_SRTP Reviewed-by: Kurt Roeckx <kurt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
		
				
					committed by
					
						
						Rich Salz
					
				
			
			
				
	
			
			
			
						parent
						
							b37d6abf8c
						
					
				
				
					commit
					b07c703ff6
				
			@@ -987,9 +987,9 @@ OPTIONS s_server_options[] = {
 | 
				
			|||||||
#ifndef OPENSSL_NO_SRTP
 | 
					#ifndef OPENSSL_NO_SRTP
 | 
				
			||||||
    {"use_srtp", OPT_SRTP_PROFILES, 's',
 | 
					    {"use_srtp", OPT_SRTP_PROFILES, 's',
 | 
				
			||||||
     "Offer SRTP key management with a colon-separated profile list"},
 | 
					     "Offer SRTP key management with a colon-separated profile list"},
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
    {"alpn", OPT_ALPN, 's',
 | 
					    {"alpn", OPT_ALPN, 's',
 | 
				
			||||||
     "Set the advertised protocols for the ALPN extension (comma-separated list)"},
 | 
					     "Set the advertised protocols for the ALPN extension (comma-separated list)"},
 | 
				
			||||||
#endif
 | 
					 | 
				
			||||||
#ifndef OPENSSL_NO_ENGINE
 | 
					#ifndef OPENSSL_NO_ENGINE
 | 
				
			||||||
    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 | 
					    {"engine", OPT_ENGINE, 's', "Use engine, possibly a hardware device"},
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
@@ -1490,9 +1490,11 @@ int s_server_main(int argc, char *argv[])
 | 
				
			|||||||
        case OPT_ALPN:
 | 
					        case OPT_ALPN:
 | 
				
			||||||
            alpn_in = opt_arg();
 | 
					            alpn_in = opt_arg();
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
 | 
					#ifndef OPENSSL_NO_SRTP
 | 
				
			||||||
        case OPT_SRTP_PROFILES:
 | 
					        case OPT_SRTP_PROFILES:
 | 
				
			||||||
            srtp_profiles = opt_arg();
 | 
					            srtp_profiles = opt_arg();
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
 | 
					#endif
 | 
				
			||||||
        case OPT_KEYMATEXPORT:
 | 
					        case OPT_KEYMATEXPORT:
 | 
				
			||||||
            keymatexportlabel = opt_arg();
 | 
					            keymatexportlabel = opt_arg();
 | 
				
			||||||
            break;
 | 
					            break;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user