| Index: crypto/include/aes_gcm_ossl.h
|
| diff --git a/srtp/crypto/include/aes_gcm_ossl.h b/crypto/include/aes_gcm_ossl.h
|
| similarity index 92%
|
| rename from srtp/crypto/include/aes_gcm_ossl.h
|
| rename to crypto/include/aes_gcm_ossl.h
|
| index 8e7711dc526c13fffa1b5b9382f1720c15d7436d..d2d0d09cd508d3cf4ba8424039b73d5861472e77 100644
|
| --- a/srtp/crypto/include/aes_gcm_ossl.h
|
| +++ b/crypto/include/aes_gcm_ossl.h
|
| @@ -8,26 +8,26 @@
|
| *
|
| */
|
| /*
|
| - *
|
| + *
|
| * Copyright (c) 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
|
| * copyright notice, this list of conditions and the following
|
| * disclaimer in the documentation and/or other materials provided
|
| * with the distribution.
|
| - *
|
| + *
|
| * Neither the name of the Cisco Systems, Inc. nor the names of its
|
| * contributors may be used to endorse or promote products derived
|
| * from this software without specific prior written permission.
|
| - *
|
| + *
|
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
| * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
| * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
|
| @@ -48,16 +48,16 @@
|
|
|
| #include "cipher.h"
|
| #include "srtp.h"
|
| +#include "datatypes.h"
|
| #include <openssl/evp.h>
|
| #include <openssl/aes.h>
|
|
|
| typedef struct {
|
| - v256_t key;
|
| - int key_size;
|
| - int tag_len;
|
| - EVP_CIPHER_CTX ctx;
|
| - cipher_direction_t dir;
|
| -} aes_gcm_ctx_t;
|
| + int key_size;
|
| + int tag_len;
|
| + EVP_CIPHER_CTX* ctx;
|
| + srtp_cipher_direction_t dir;
|
| +} srtp_aes_gcm_ctx_t;
|
|
|
| #endif /* AES_GCM_OSSL_H */
|
|
|
|
|