Commit 08981470 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

ssl/*: fix linking errors with no-srtp.

parent 4d8da30f

apps/s_client.c

+10 −0
Original line number Diff line number Diff line
@@ -362,7 +362,9 @@ static void sc_usage(void) 
# endif

#endif

	BIO_printf(bio_err," -legacy_renegotiation - enable use of legacy renegotiation (dangerous)\n");

#ifndef OPENSSL_NO_SRTP

	BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");

#endif

 	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");

 	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");

	}
@@ -502,7 +504,9 @@ static char * MS_CALLBACK ssl_give_srp_client_pwd_cb(SSL *s, void *arg) 
	}



#endif

#ifndef OPENSSL_NO_SRTP

	char *srtp_profiles = NULL;

#endif



# ifndef OPENSSL_NO_NEXTPROTONEG

/* This the context that we pass to next_proto_cb */
@@ -945,11 +949,13 @@ int MAIN(int argc, char **argv) 
			jpake_secret = *++argv;

			}

#endif

#ifndef OPENSSL_NO_SRTP

		else if (strcmp(*argv,"-use_srtp") == 0)

			{

			if (--argc < 1) goto bad;

			srtp_profiles = *(++argv);

			}

#endif

		else if (strcmp(*argv,"-keymatexport") == 0)

			{

			if (--argc < 1) goto bad;
@@ -1130,6 +1136,8 @@ bad: 
			BIO_printf(bio_c_out, "PSK key given or JPAKE in use, setting client callback\n");

		SSL_CTX_set_psk_client_callback(ctx, psk_client_cb);

		}

#endif

#ifndef OPENSSL_NO_SRTP

	if (srtp_profiles != NULL)

		SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);

#endif
@@ -2067,6 +2075,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
	}

#endif



#ifndef OPENSSL_NO_SRTP

 	{

 	SRTP_PROTECTION_PROFILE *srtp_profile=SSL_get_selected_srtp_profile(s);
@@ -2074,6 +2083,7 @@ static void print_stuff(BIO *bio, SSL *s, int full) 
		BIO_printf(bio,"SRTP Extension negotiated, profile=%s\n",

			   srtp_profile->name);

	}

#endif

 

	SSL_SESSION_print(bio,SSL_get_session(s));

	if (keymatexportlabel != NULL)

apps/s_server.c

+10 −0
Original line number Diff line number Diff line
@@ -556,7 +556,9 @@ static void sv_usage(void) 
# ifndef OPENSSL_NO_NEXTPROTONEG

	BIO_printf(bio_err," -nextprotoneg arg - set the advertised protocols for the NPN extension (comma-separated list)\n");

# endif

# ifndef OPENSSL_NO_SRTP

        BIO_printf(bio_err," -use_srtp profiles - Offer SRTP key management with a colon-separated profile list\n");

# endif

#endif

	BIO_printf(bio_err," -keymatexport label   - Export keying material using label\n");

	BIO_printf(bio_err," -keymatexportlen len  - Export len bytes of keying material (default 20)\n");
@@ -923,7 +925,9 @@ static char *jpake_secret = NULL; 
#ifndef OPENSSL_NO_SRP

	static srpsrvparm srp_callback_parm;

#endif

#ifndef OPENSSL_NO_SRTP

static char *srtp_profiles = NULL;

#endif



int MAIN(int argc, char *argv[])

	{
@@ -1319,11 +1323,13 @@ int MAIN(int argc, char *argv[]) 
			jpake_secret = *(++argv);

			}

#endif

#ifndef OPENSSL_NO_SRTP

		else if (strcmp(*argv,"-use_srtp") == 0)

			{

			if (--argc < 1) goto bad;

			srtp_profiles = *(++argv);

			}

#endif

		else if (strcmp(*argv,"-keymatexport") == 0)

			{

			if (--argc < 1) goto bad;
@@ -1549,8 +1555,10 @@ bad: 
	else

		SSL_CTX_sess_set_cache_size(ctx,128);



#ifndef OPENSSL_NO_SRTP

	if (srtp_profiles != NULL)

		SSL_CTX_set_tlsext_use_srtp(ctx, srtp_profiles);

#endif



#if 0

	if (cipher == NULL) cipher=getenv("SSL_CIPHER");
@@ -2450,6 +2458,7 @@ static int init_ssl_connection(SSL *con) 
		BIO_printf(bio_s_out, "\n");

		}

#endif

#ifndef OPENSSL_NO_SRTP

	{

	SRTP_PROTECTION_PROFILE *srtp_profile

	  = SSL_get_selected_srtp_profile(con);
@@ -2458,6 +2467,7 @@ static int init_ssl_connection(SSL *con) 
		BIO_printf(bio_s_out,"SRTP Extension negotiated, profile=%s\n",

			   srtp_profile->name);

	}

#endif

	if (SSL_cache_hit(con)) BIO_printf(bio_s_out,"Reused session-id\n");

	if (SSL_ctrl(con,SSL_CTRL_GET_FLAGS,0,NULL) &

		TLS1_FLAGS_TLS_PADDING_BUG)

ssl/d1_srtp.c

+3 −2
Original line number Diff line number Diff line
@@ -115,11 +115,12 @@ 
  Copyright (C) 2011, RTFM, Inc.

*/



#ifndef OPENSSL_NO_SRTP



#include <stdio.h>

#include <openssl/objects.h>

#include "ssl_locl.h"



#ifndef OPENSSL_NO_SRTP



#include "srtp.h"

ssl/ssl_lib.c

+4 −0
Original line number Diff line number Diff line
@@ -597,8 +597,10 @@ void SSL_free(SSL *s) 
		OPENSSL_free(s->next_proto_negotiated);

#endif



#ifndef OPENSSL_NO_SRTP

        if (s->srtp_profiles)

            sk_SRTP_PROTECTION_PROFILE_free(s->srtp_profiles);

#endif



	OPENSSL_free(s);

	}
@@ -1952,8 +1954,10 @@ void SSL_CTX_free(SSL_CTX *a) 
	a->comp_methods = NULL;

#endif



#ifndef OPENSSL_NO_SRTP

        if (a->srtp_profiles)

                sk_SRTP_PROTECTION_PROFILE_free(a->srtp_profiles);

#endif



#ifndef OPENSSL_NO_PSK

	if (a->psk_identity_hint)

ssl/t1_lib.c

+12 −4
Original line number Diff line number Diff line
@@ -649,6 +649,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha 
		}

#endif



#ifndef OPENSSL_NO_SRTP

        if(SSL_get_srtp_profiles(s))

                {

                int el;
@@ -667,6 +668,7 @@ unsigned char *ssl_add_clienthello_tlsext(SSL *s, unsigned char *p, unsigned cha 
			}

                ret += el;

                }

#endif



	if ((extdatalen = ret-p-2)== 0) 

		return p;
@@ -781,6 +783,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha 
		}

#endif



#ifndef OPENSSL_NO_SRTP

        if(s->srtp_profile)

                {

                int el;
@@ -799,6 +802,7 @@ unsigned char *ssl_add_serverhello_tlsext(SSL *s, unsigned char *p, unsigned cha 
			}

                ret+=el;

                }

#endif



	if (((s->s3->tmp.new_cipher->id & 0xFFFF)==0x80 || (s->s3->tmp.new_cipher->id & 0xFFFF)==0x81) 

		&& (SSL_get_options(s) & SSL_OP_CRYPTOPRO_TLSEXT_BUG))
@@ -1329,12 +1333,14 @@ int ssl_parse_clienthello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in 
#endif



		/* session ticket processed earlier */

#ifndef OPENSSL_NO_SRTP

		else if (type == TLSEXT_TYPE_use_srtp)

			{

			if(ssl_parse_clienthello_use_srtp_ext(s, data, size,

							      al))

				return 0;

			}

#endif



		data+=size;

		}
@@ -1579,12 +1585,14 @@ int ssl_parse_serverhello_tlsext(SSL *s, unsigned char **p, unsigned char *d, in 
				}

			}

#endif

#ifndef OPENSSL_NO_SRTP

		else if (type == TLSEXT_TYPE_use_srtp)

			{

                        if(ssl_parse_serverhello_use_srtp_ext(s, data, size,

							      al))

                                return 0;

			}

#endif



		data+=size;		

		}