Deleted Added
full compact
dh_kdf.c (302408) dh_kdf.c (325337)
1/* crypto/dh/dh_kdf.c */
2/*
3 * Written by Stephen Henson for the OpenSSL project.
4 */
5/* ====================================================================
6 * Copyright (c) 2013 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 37 unchanged lines hidden (view full) ---

46 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50 * OF THE POSSIBILITY OF SUCH DAMAGE.
51 * ====================================================================
52 */
53
1/* crypto/dh/dh_kdf.c */
2/*
3 * Written by Stephen Henson for the OpenSSL project.
4 */
5/* ====================================================================
6 * Copyright (c) 2013 The OpenSSL Project. All rights reserved.
7 *
8 * Redistribution and use in source and binary forms, with or without

--- 37 unchanged lines hidden (view full) ---

46 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
47 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
48 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
49 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
50 * OF THE POSSIBILITY OF SUCH DAMAGE.
51 * ====================================================================
52 */
53
54#include <e_os.h>
55
56#ifndef OPENSSL_NO_CMS
54#include <string.h>
55#include <openssl/dh.h>
56#include <openssl/evp.h>
57#include <openssl/asn1.h>
58#include <openssl/cms.h>
59
60/* Key derivation from X9.42/RFC2631 */
61

--- 118 unchanged lines hidden (view full) ---

180 }
181 rv = 1;
182 err:
183 if (der)
184 OPENSSL_free(der);
185 EVP_MD_CTX_cleanup(&mctx);
186 return rv;
187}
57#include <string.h>
58#include <openssl/dh.h>
59#include <openssl/evp.h>
60#include <openssl/asn1.h>
61#include <openssl/cms.h>
62
63/* Key derivation from X9.42/RFC2631 */
64

--- 118 unchanged lines hidden (view full) ---

183 }
184 rv = 1;
185 err:
186 if (der)
187 OPENSSL_free(der);
188 EVP_MD_CTX_cleanup(&mctx);
189 return rv;
190}
191#endif