Land https://codereview.chromium.org/889083003/ to update libsrtp to upstream 1.5.0

srtp/crypto/include/hmac.h

 /*
  * hmac.h
  *
  * interface to hmac auth_type_t
  *
  * David A. McGrew
  * Cisco Systems, Inc.
  *
  */
 /*
  *      
- * Copyright (c) 2001-2006, Cisco Systems, Inc.
+ * Copyright (c) 2001-2006,2013, Cisco Systems, Inc.
  * All rights reserved.
  * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 
  *   Redistributions of source code must retain the above copyright
  *   notice, this list of conditions and the following disclaimer.
  * 
  *   Redistributions in binary form must reproduce the above
@@ skipping 23 matching lines @@
 #ifndef HMAC_H
 #define HMAC_H
 
 #include "auth.h"
 #include "sha1.h"
 
 typedef struct {
   uint8_t    opad[64];
   sha1_ctx_t ctx;
   sha1_ctx_t init_ctx;
+#ifdef OPENSSL
+  int ctx_initialized;
+  int init_ctx_initialized;
+#endif
 } hmac_ctx_t;
 
 err_status_t
 hmac_alloc(auth_t **a, int key_len, int out_len);
 
 err_status_t
 hmac_dealloc(auth_t *a);
 
 err_status_t
 hmac_init(hmac_ctx_t *state, const uint8_t *key, int key_len);
 
 err_status_t
 hmac_start(hmac_ctx_t *state);
 
 err_status_t
 hmac_update(hmac_ctx_t *state, const uint8_t *message, int msg_octets);
 
 err_status_t
 hmac_compute(hmac_ctx_t *state, const void *message,
              int msg_octets, int tag_len, uint8_t *result);
 
 
 #endif /* HMAC_H */