[asterisk-dev] SRTP, Sdescriptions, and TLS

[Mohammad Halawah]

Hi,

As expected, the patch (ast_srtp_r81432_mikey_r3412.patch) did not
apply cleanly. Here is the result I got:

#####################

patching file build_tools/menuselect-deps.in
Hunk #1 FAILED at 11.
Hunk #2 succeeded at 31 (offset 1 line).
1 out of 2 hunks FAILED -- saving rejects to file
build_tools/menuselect-deps.in.rej
patching file channels/chan_sip.c
Hunk #1 succeeded at 146 with fuzz 2 (offset 1 line).
Hunk #2 succeeded at 209 (offset -2 lines).
Hunk #3 succeeded at 1148 with fuzz 1 (offset 23 lines).
Hunk #4 succeeded at 1830 (offset 45 lines).
Hunk #5 succeeded at 3735 (offset 198 lines).
Hunk #6 succeeded at 3960 with fuzz 1 (offset 199 lines).
Hunk #7 succeeded at 5821 (offset 231 lines).
Hunk #8 succeeded at 5895 (offset 231 lines).
Hunk #9 succeeded at 5924 (offset 231 lines).
Hunk #10 succeeded at 6105 (offset 231 lines).
Hunk #11 succeeded at 6113 (offset 231 lines).
Hunk #12 succeeded at 6178 (offset 231 lines).
Hunk #13 succeeded at 6284 (offset 231 lines).
Hunk #14 succeeded at 7390 (offset 232 lines).
Hunk #15 succeeded at 7451 (offset 235 lines).
Hunk #16 succeeded at 7542 with fuzz 2 (offset 235 lines).
Hunk #17 succeeded at 7649 (offset 235 lines).
Hunk #18 succeeded at 7668 (offset 235 lines).
Hunk #19 succeeded at 19476 (offset 589 lines).
Hunk #20 succeeded at 19630 (offset 554 lines).
Hunk #21 succeeded at 19782 (offset 562 lines).
patching file channels/Makefile
Hunk #1 succeeded at 106 (offset 3 lines).
patching file channels/sdp_crypto.c
patching file channels/sdp_crypto.h
patching file channels/sdp_mikey.c
patching file channels/sdp_mikey.h
patching file channels/sip_srtp.c
patching file channels/sip_srtp.h
patching file configure.ac
Hunk #1 FAILED at 194.
Hunk #3 succeeded at 786 (offset 47 lines).
Hunk #4 succeeded at 1031 (offset 53 lines).
1 out of 4 hunks FAILED -- saving rejects to file configure.ac.rej
patching file CREDITS
Hunk #1 FAILED at 145.
1 out of 1 hunk FAILED -- saving rejects to file CREDITS.rej
patching file include/asterisk/aes_internal.h
patching file include/asterisk/autoconfig.h.in
Hunk #1 succeeded at 355 (offset 99 lines).
Hunk #2 succeeded at 697 with fuzz 2 (offset 195 lines).
patching file include/asterisk/mikey.h
patching file include/asterisk/rtp.h
patching file main/cryptostub.c
patching file main/rtp.c
Hunk #4 succeeded at 1038 (offset 4 lines).
Hunk #5 succeeded at 1618 (offset 5 lines).
Hunk #6 succeeded at 2748 (offset 5 lines).
Hunk #7 succeeded at 3156 (offset 5 lines).
Hunk #8 succeeded at 3241 (offset 5 lines).
Hunk #9 succeeded at 3938 (offset 19 lines).
patching file makeopts.in
Hunk #1 succeeded at 102 with fuzz 2.
patching file res/Makefile
patching file res/mikey.cc
patching file res/mikey.h
patching file res/res_mikey.c
patching file res/res_srtp.c
####################

Best regards,
Mohammad


On 11/6/07, Mikael Magnusson <mikma264 at gmail.com> wrote:
> Mohammad Halawah wrote:
> > On 11/6/07, Mikael Magnusson <mikma264 at gmail.com> wrote:
> ...
> > Hi Mikael,
> >
> >> I haven't tried to apply the SRTP patch on the sip-tcptls branch, you
> >> may need to deal with conflicts since both touch chan_sip.
> >
> > Actually I am expecting some troubles, but I wanted to start with the
> > best available combination to    avoid unnecessary work.
> >
> ...
> >> I would like to add that the SRTP patch besides sdescriptions also
> >> supports MIKEY (Multimedia KEYing), which doesn't require a secure
> >> transport such as TLS or S/MIME.
> >
> > The problem is that Snom phones doesn't support neither ZRTP nor MIKEY.
> > Can you tell me which patch should I use with sip-tcp/tls trunk?
> >
>
> Try the latest one (ast_srtp_r81432_mikey_r3412.patch). There are
> probably some conflicts since trunk has changed a bit, I will hopefully
> have time to upload an updated patch soon.
>
> Mikael
>
> _______________________________________________
> --Bandwidth and Colocation Provided by http://www.api-digital.com--
>
> asterisk-dev mailing list
> To UNSUBSCRIBE or update options visit:
>    http://lists.digium.com/mailman/listinfo/asterisk-dev
>