| 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, |
| (...skipping 15 matching lines...) Expand all Loading... |
| 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 "talk/session/media/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 "srtp.h" // NOLINT | 37 #include "srtp.h" // NOLINT |
| 37 #include "crypto_kernel.h" // NOLINT | |
| 38 #else | 38 #else |
| 39 #include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h" |
| 39 #include "third_party/libsrtp/srtp/include/srtp.h" | 40 #include "third_party/libsrtp/srtp/include/srtp.h" |
| 40 #include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h" | |
| 41 #endif // SRTP_RELATIVE_PATH | 41 #endif // SRTP_RELATIVE_PATH |
| 42 } | 42 } |
| 43 | 43 |
| 44 #include "webrtc/base/logging.h" | 44 #include "webrtc/base/logging.h" |
| 45 | 45 |
| 46 // Begin test case 0 */ | 46 // Begin test case 0 */ |
| 47 static const uint8_t kExternalHmacTestCase0Key[20] = { | 47 static const uint8_t kExternalHmacTestCase0Key[20] = { |
| 48 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, | 48 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, |
| 49 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, | 49 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, |
| 50 0x0b, 0x0b, 0x0b, 0x0b | 50 0x0b, 0x0b, 0x0b, 0x0b |
| (...skipping 117 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 |