diff options
Diffstat (limited to 'src/lib/libcrypto/ecdh/ech_lib.c')
-rw-r--r-- | src/lib/libcrypto/ecdh/ech_lib.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/lib/libcrypto/ecdh/ech_lib.c b/src/lib/libcrypto/ecdh/ech_lib.c index e9fae9428b..43c4f8ce31 100644 --- a/src/lib/libcrypto/ecdh/ech_lib.c +++ b/src/lib/libcrypto/ecdh/ech_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ech_lib.c,v 1.7 2014/07/10 22:45:57 jsing Exp $ */ | 1 | /* $OpenBSD: ech_lib.c,v 1.8 2015/02/07 13:19:15 doug Exp $ */ |
2 | /* ==================================================================== | 2 | /* ==================================================================== |
3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. | 3 | * Copyright 2002 Sun Microsystems, Inc. ALL RIGHTS RESERVED. |
4 | * | 4 | * |
@@ -106,11 +106,6 @@ int ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth) | |||
106 | if (ecdh == NULL) | 106 | if (ecdh == NULL) |
107 | return 0; | 107 | return 0; |
108 | 108 | ||
109 | #if 0 | ||
110 | mtmp = ecdh->meth; | ||
111 | if (mtmp->finish) | ||
112 | mtmp->finish(eckey); | ||
113 | #endif | ||
114 | #ifndef OPENSSL_NO_ENGINE | 109 | #ifndef OPENSSL_NO_ENGINE |
115 | if (ecdh->engine) | 110 | if (ecdh->engine) |
116 | { | 111 | { |
@@ -119,10 +114,6 @@ int ECDH_set_method(EC_KEY *eckey, const ECDH_METHOD *meth) | |||
119 | } | 114 | } |
120 | #endif | 115 | #endif |
121 | ecdh->meth = meth; | 116 | ecdh->meth = meth; |
122 | #if 0 | ||
123 | if (meth->init) | ||
124 | meth->init(eckey); | ||
125 | #endif | ||
126 | return 1; | 117 | return 1; |
127 | } | 118 | } |
128 | 119 | ||
@@ -159,14 +150,6 @@ static ECDH_DATA *ECDH_DATA_new_method(ENGINE *engine) | |||
159 | 150 | ||
160 | ret->flags = ret->meth->flags; | 151 | ret->flags = ret->meth->flags; |
161 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data); | 152 | CRYPTO_new_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data); |
162 | #if 0 | ||
163 | if ((ret->meth->init != NULL) && !ret->meth->init(ret)) | ||
164 | { | ||
165 | CRYPTO_free_ex_data(CRYPTO_EX_INDEX_ECDH, ret, &ret->ex_data); | ||
166 | free(ret); | ||
167 | ret=NULL; | ||
168 | } | ||
169 | #endif | ||
170 | return(ret); | 153 | return(ret); |
171 | } | 154 | } |
172 | 155 | ||