Commit 0d6ff6d3 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

EC_KEY_METHOD init and finish support 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 51966416

crypto/ec/ec_key.c

+3 −0
Original line number Diff line number Diff line
@@ -107,6 +107,9 @@ void EC_KEY_free(EC_KEY *r) 
    }

#endif



    if (r->meth->finish)

        r->meth->finish(r);



#ifndef OPENSSL_NO_ENGINE

    if (r->engine)

        ENGINE_finish(r->engine);

crypto/ec/ec_kmeth.c

+6 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ 
static const EC_KEY_METHOD openssl_ec_key_method = {

    "OpenSSL EC_KEY method",

    0,

    0,0,

    ossl_ec_key_gen,

    ossl_ecdh_compute_key

};
@@ -120,7 +121,11 @@ EC_KEY *EC_KEY_new_method(ENGINE *engine) 
    ret->version = 1;

    ret->conv_form = POINT_CONVERSION_UNCOMPRESSED;

    ret->references = 1;

    return (ret);

    if (ret->meth->init && ret->meth->init(ret) == 0) {

        EC_KEY_free(ret);

        return NULL;

    }

    return ret;

}



int ECDH_compute_key(void *out, size_t outlen, const EC_POINT *pub_key,

crypto/ec/ec_lcl.h

+2 −0
Original line number Diff line number Diff line
@@ -560,6 +560,8 @@ const EC_METHOD *EC_GFp_nistz256_method(void); 
struct ec_key_method_st {

    const char *name;

    int32_t flags;

    int (*init)(EC_KEY *key);

    void (*finish)(EC_KEY *key);

    int (*keygen)(EC_KEY *key);

    int (*compute_key)(void *out, size_t outlen, const EC_POINT *pub_key,

                       EC_KEY *ecdh,