Commit 6c4e6670 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

utility function 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
parent fb79abe3

ssl/s3_lib.c

+13 −0
Original line number Diff line number Diff line
@@ -4639,3 +4639,16 @@ int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey) 
    EVP_PKEY_CTX_free(pctx);

    return rv;

}



EVP_PKEY *ssl_dh_to_pkey(DH *dh)

{

    EVP_PKEY *ret;

    if (dh == NULL)

        return NULL;

    ret = EVP_PKEY_new();

    if (EVP_PKEY_set1_DH(ret, dh) <= 0) {

        EVP_PKEY_free(ret);

        return NULL;

    }

    return ret;

}

ssl/ssl_locl.h

+1 −0
Original line number Diff line number Diff line
@@ -1859,6 +1859,7 @@ __owur int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen, 
                                      int free_pms);

__owur EVP_PKEY *ssl_generate_pkey(EVP_PKEY *pm, int nid);

__owur int ssl_derive(SSL *s, EVP_PKEY *privkey, EVP_PKEY *pubkey);

__owur EVP_PKEY *ssl_dh_to_pkey(DH *dh);



__owur const SSL_CIPHER *ssl3_get_cipher_by_char(const unsigned char *p);

__owur int ssl3_put_cipher_by_char(const SSL_CIPHER *c, unsigned char *p);