| OLD | NEW |
| 1 /* | 1 /* |
| 2 * libjingle | 2 * libjingle |
| 3 * Copyright 2014 Google Inc. | 3 * Copyright 2014 Google Inc. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are met: | 6 * modification, are permitted provided that the following conditions are met: |
| 7 * | 7 * |
| 8 * 1. Redistributions of source code must retain the above copyright notice, | 8 * 1. Redistributions of source code must retain the above copyright notice, |
| 9 * this list of conditions and the following disclaimer. | 9 * this list of conditions and the following disclaimer. |
| 10 * 2. Redistributions in binary form must reproduce the above copyright notice, | 10 * 2. Redistributions in binary form must reproduce the above copyright notice, |
| 11 * this list of conditions and the following disclaimer in the documentation | 11 * this list of conditions and the following disclaimer in the documentation |
| 12 * and/or other materials provided with the distribution. | 12 * and/or other materials provided with the distribution. |
| 13 * 3. The name of the author may not be used to endorse or promote products | 13 * 3. The name of the author may not be used to endorse or promote products |
| 14 * derived from this software without specific prior written permission. | 14 * derived from this software without specific prior written permission. |
| 15 * | 15 * |
| 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED | 16 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED |
| 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | 17 * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF |
| 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO | 18 * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO |
| 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | 19 * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
| 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 20 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; | 21 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; |
| 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, | 22 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, |
| 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR | 23 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR |
| 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF | 24 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
| 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 26 */ | 26 */ |
| 27 | 27 |
| 28 #if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) | 28 #if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) |
| 29 | 29 |
| 30 #include "talk/session/media/externalhmac.h" | 30 #include "webrtc/pc/externalhmac.h" |
| 31 | 31 |
| 32 #include <stdlib.h> // For malloc/free. | 32 #include <stdlib.h> // For malloc/free. |
| 33 | 33 |
| 34 extern "C" { | 34 extern "C" { |
| 35 #ifdef SRTP_RELATIVE_PATH | 35 #ifdef SRTP_RELATIVE_PATH |
| 36 #include "crypto_kernel.h" // NOLINT | 36 #include "crypto_kernel.h" // NOLINT |
| 37 #include "srtp.h" // NOLINT | 37 #include "srtp.h" // NOLINT |
| 38 #else | 38 #else |
| 39 #include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h" | 39 #include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h" |
| 40 #include "third_party/libsrtp/srtp/include/srtp.h" | 40 #include "third_party/libsrtp/srtp/include/srtp.h" |
| (...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 const_cast<auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1); | 168 const_cast<auth_type_t*>(&external_hmac), EXTERNAL_HMAC_SHA1); |
| 169 if (status) { | 169 if (status) { |
| 170 LOG(LS_ERROR) << "Error in replacing default auth module, error: " | 170 LOG(LS_ERROR) << "Error in replacing default auth module, error: " |
| 171 << status; | 171 << status; |
| 172 return err_status_fail; | 172 return err_status_fail; |
| 173 } | 173 } |
| 174 return err_status_ok; | 174 return err_status_ok; |
| 175 } | 175 } |
| 176 | 176 |
| 177 #endif // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) | 177 #endif // defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) |
| OLD | NEW |