Update libsrtp to upstream 1.5.0

srtp/crypto/kernel/alloc.c

 /*
  * alloc.c
  *
  * memory allocation and deallocation 
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  */
 /*
  *      
@@ skipping 24 matching lines @@
  * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
  * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
  * OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
+#ifdef HAVE_CONFIG_H
+    #include <config.h>
+#endif
+
 #include "alloc.h"
 #include "crypto_kernel.h"
 
 /* the debug module for memory allocation */
 
 debug_module_t mod_alloc = {
   0,                  /* debugging is off by default */
   "alloc"             /* printable name for module   */
 };
 
@@ skipping 11 matching lines @@
 #include <linux/interrupt.h>
 
 void *
 crypto_alloc(size_t size) {
   void *ptr;
 
   ptr = kmalloc(size, in_interrupt() ? GFP_ATOMIC : GFP_KERNEL);
 
   if (ptr) {
     debug_print(mod_alloc, "(location: %p) allocated", ptr);
-  } else
+  } else {
     debug_print(mod_alloc, "allocation failed (asked for %d bytes)\n", size);
+  }
 
   return ptr;
 }
 
 void 
 crypto_free(void *ptr) {
 
   debug_print(mod_alloc, "(location: %p) freed", ptr);
 
   kfree(ptr);
 }
 
 
 #elif defined(HAVE_STDLIB_H)
 
 void *
 crypto_alloc(size_t size) {
   void *ptr;
 
   ptr = malloc(size);
     
   if (ptr) {
     debug_print(mod_alloc, "(location: %p) allocated", ptr);
-  } else
+  } else {
     debug_print(mod_alloc, "allocation failed (asked for %d bytes)\n", size);
-    
+  }
+
   return ptr;
 }
 
 void 
 crypto_free(void *ptr) {
 
   debug_print(mod_alloc, "(location: %p) freed", ptr);
 
   free(ptr);
 }
 
 #else  /* we need to define our own memory allocation routines */
 
 #error no memory allocation defined yet 
 
 #endif