summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/lib/libcrypto/ec/ec.h8
-rw-r--r--src/lib/libcrypto/ec/ec_kmeth.c10
-rw-r--r--src/lib/libcrypto/ecdsa/ecdsa.h6
3 files changed, 12 insertions, 12 deletions
diff --git a/src/lib/libcrypto/ec/ec.h b/src/lib/libcrypto/ec/ec.h
index 0b8d2cb355..1c5641eca0 100644
--- a/src/lib/libcrypto/ec/ec.h
+++ b/src/lib/libcrypto/ec/ec.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ec.h,v 1.15 2019/01/19 01:12:48 tb Exp $ */ 1/* $OpenBSD: ec.h,v 1.16 2019/01/19 01:17:41 tb Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -971,16 +971,16 @@ void EC_KEY_METHOD_set_keygen(EC_KEY_METHOD *meth,
971void EC_KEY_METHOD_set_compute_key(EC_KEY_METHOD *meth, 971void EC_KEY_METHOD_set_compute_key(EC_KEY_METHOD *meth,
972 int (*ckey)(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, 972 int (*ckey)(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
973 void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen))); 973 void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)));
974void EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth, 974void EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
975 int (**pinit)(EC_KEY *key), 975 int (**pinit)(EC_KEY *key),
976 void (**pfinish)(EC_KEY *key), 976 void (**pfinish)(EC_KEY *key),
977 int (**pcopy)(EC_KEY *dest, const EC_KEY *src), 977 int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
978 int (**pset_group)(EC_KEY *key, const EC_GROUP *grp), 978 int (**pset_group)(EC_KEY *key, const EC_GROUP *grp),
979 int (**pset_private)(EC_KEY *key, const BIGNUM *priv_key), 979 int (**pset_private)(EC_KEY *key, const BIGNUM *priv_key),
980 int (**pset_public)(EC_KEY *key, const EC_POINT *pub_key)); 980 int (**pset_public)(EC_KEY *key, const EC_POINT *pub_key));
981void EC_KEY_METHOD_get_keygen(EC_KEY_METHOD *meth, 981void EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth,
982 int (**pkeygen)(EC_KEY *key)); 982 int (**pkeygen)(EC_KEY *key));
983void EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth, 983void EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
984 int (**pck)(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, 984 int (**pck)(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
985 void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen))); 985 void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)));
986 986
diff --git a/src/lib/libcrypto/ec/ec_kmeth.c b/src/lib/libcrypto/ec/ec_kmeth.c
index 158f542d40..3e847e5fc5 100644
--- a/src/lib/libcrypto/ec/ec_kmeth.c
+++ b/src/lib/libcrypto/ec/ec_kmeth.c
@@ -262,7 +262,7 @@ EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
262 262
263 263
264void 264void
265EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth, 265EC_KEY_METHOD_get_init(const EC_KEY_METHOD *meth,
266 int (**pinit)(EC_KEY *key), 266 int (**pinit)(EC_KEY *key),
267 void (**pfinish)(EC_KEY *key), 267 void (**pfinish)(EC_KEY *key),
268 int (**pcopy)(EC_KEY *dest, const EC_KEY *src), 268 int (**pcopy)(EC_KEY *dest, const EC_KEY *src),
@@ -285,7 +285,7 @@ EC_KEY_METHOD_get_init(EC_KEY_METHOD *meth,
285} 285}
286 286
287void 287void
288EC_KEY_METHOD_get_keygen(EC_KEY_METHOD *meth, 288EC_KEY_METHOD_get_keygen(const EC_KEY_METHOD *meth,
289 int (**pkeygen)(EC_KEY *key)) 289 int (**pkeygen)(EC_KEY *key))
290{ 290{
291 if (pkeygen != NULL) 291 if (pkeygen != NULL)
@@ -293,7 +293,7 @@ EC_KEY_METHOD_get_keygen(EC_KEY_METHOD *meth,
293} 293}
294 294
295void 295void
296EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth, 296EC_KEY_METHOD_get_compute_key(const EC_KEY_METHOD *meth,
297 int (**pck)(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh, 297 int (**pck)(void *out, size_t outlen, const EC_POINT *pub_key, EC_KEY *ecdh,
298 void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen))) 298 void *(*KDF) (const void *in, size_t inlen, void *out, size_t *outlen)))
299{ 299{
@@ -302,7 +302,7 @@ EC_KEY_METHOD_get_compute_key(EC_KEY_METHOD *meth,
302} 302}
303 303
304void 304void
305EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth, 305EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
306 int (**psign)(int type, const unsigned char *dgst, 306 int (**psign)(int type, const unsigned char *dgst,
307 int dlen, unsigned char *sig, unsigned int *siglen, 307 int dlen, unsigned char *sig, unsigned int *siglen,
308 const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey), 308 const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey),
@@ -321,7 +321,7 @@ EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
321} 321}
322 322
323void 323void
324EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth, 324EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
325 int (**pverify)(int type, const unsigned char *dgst, int dgst_len, 325 int (**pverify)(int type, const unsigned char *dgst, int dgst_len,
326 const unsigned char *sigbuf, int sig_len, EC_KEY *eckey), 326 const unsigned char *sigbuf, int sig_len, EC_KEY *eckey),
327 int (**pverify_sig)(const unsigned char *dgst, int dgst_len, 327 int (**pverify_sig)(const unsigned char *dgst, int dgst_len,
diff --git a/src/lib/libcrypto/ecdsa/ecdsa.h b/src/lib/libcrypto/ecdsa/ecdsa.h
index 71b8825436..c4e107eee5 100644
--- a/src/lib/libcrypto/ecdsa/ecdsa.h
+++ b/src/lib/libcrypto/ecdsa/ecdsa.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: ecdsa.h,v 1.7 2019/01/19 01:12:48 tb Exp $ */ 1/* $OpenBSD: ecdsa.h,v 1.8 2019/01/19 01:17:41 tb Exp $ */
2/** 2/**
3 * \file crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions 3 * \file crypto/ecdsa/ecdsa.h Include file for the OpenSSL ECDSA functions
4 * \author Written by Nils Larsch for the OpenSSL project 4 * \author Written by Nils Larsch for the OpenSSL project
@@ -284,7 +284,7 @@ void EC_KEY_METHOD_set_verify(EC_KEY_METHOD *meth,
284 const unsigned char *sigbuf, int sig_len, EC_KEY *eckey), 284 const unsigned char *sigbuf, int sig_len, EC_KEY *eckey),
285 int (*verify_sig)(const unsigned char *dgst, int dgst_len, 285 int (*verify_sig)(const unsigned char *dgst, int dgst_len,
286 const ECDSA_SIG *sig, EC_KEY *eckey)); 286 const ECDSA_SIG *sig, EC_KEY *eckey));
287void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth, 287void EC_KEY_METHOD_get_sign(const EC_KEY_METHOD *meth,
288 int (**psign)(int type, const unsigned char *dgst, 288 int (**psign)(int type, const unsigned char *dgst,
289 int dlen, unsigned char *sig, unsigned int *siglen, 289 int dlen, unsigned char *sig, unsigned int *siglen,
290 const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey), 290 const BIGNUM *kinv, const BIGNUM *r, EC_KEY *eckey),
@@ -293,7 +293,7 @@ void EC_KEY_METHOD_get_sign(EC_KEY_METHOD *meth,
293 ECDSA_SIG *(**psign_sig)(const unsigned char *dgst, 293 ECDSA_SIG *(**psign_sig)(const unsigned char *dgst,
294 int dgst_len, const BIGNUM *in_kinv, const BIGNUM *in_r, 294 int dgst_len, const BIGNUM *in_kinv, const BIGNUM *in_r,
295 EC_KEY *eckey)); 295 EC_KEY *eckey));
296void EC_KEY_METHOD_get_verify(EC_KEY_METHOD *meth, 296void EC_KEY_METHOD_get_verify(const EC_KEY_METHOD *meth,
297 int (**pverify)(int type, const unsigned char *dgst, int dgst_len, 297 int (**pverify)(int type, const unsigned char *dgst, int dgst_len,
298 const unsigned char *sigbuf, int sig_len, EC_KEY *eckey), 298 const unsigned char *sigbuf, int sig_len, EC_KEY *eckey),
299 int (**pverify_sig)(const unsigned char *dgst, int dgst_len, 299 int (**pverify_sig)(const unsigned char *dgst, int dgst_len,