diff options
author | tb <> | 2018-02-20 17:45:44 +0000 |
---|---|---|
committer | tb <> | 2018-02-20 17:45:44 +0000 |
commit | 90a2cac2c9296c6001b956f786252ce7b31af437 (patch) | |
tree | 800b6a84ca7bb475426a66249adbaf245110e320 /src | |
parent | e6e87dba22757a3b4937ac796bb40b817e71a3d3 (diff) | |
download | openbsd-90a2cac2c9296c6001b956f786252ce7b31af437.tar.gz openbsd-90a2cac2c9296c6001b956f786252ce7b31af437.tar.bz2 openbsd-90a2cac2c9296c6001b956f786252ce7b31af437.zip |
Provide DSA_{clear,set,test}_flags()
ok jsing
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/Symbols.list | 3 | ||||
-rw-r--r-- | src/lib/libcrypto/dsa/dsa.h | 5 | ||||
-rw-r--r-- | src/lib/libcrypto/dsa/dsa_lib.c | 20 |
3 files changed, 26 insertions, 2 deletions
diff --git a/src/lib/libcrypto/Symbols.list b/src/lib/libcrypto/Symbols.list index a6137ca95d..0cb1c38106 100644 --- a/src/lib/libcrypto/Symbols.list +++ b/src/lib/libcrypto/Symbols.list | |||
@@ -800,6 +800,7 @@ DSA_OpenSSL | |||
800 | DSA_SIG_free | 800 | DSA_SIG_free |
801 | DSA_SIG_it | 801 | DSA_SIG_it |
802 | DSA_SIG_new | 802 | DSA_SIG_new |
803 | DSA_clear_flags | ||
803 | DSA_do_sign | 804 | DSA_do_sign |
804 | DSA_do_verify | 805 | DSA_do_verify |
805 | DSA_dup_DH | 806 | DSA_dup_DH |
@@ -820,10 +821,12 @@ DSA_set0_key | |||
820 | DSA_set0_pqg | 821 | DSA_set0_pqg |
821 | DSA_set_default_method | 822 | DSA_set_default_method |
822 | DSA_set_ex_data | 823 | DSA_set_ex_data |
824 | DSA_set_flags | ||
823 | DSA_set_method | 825 | DSA_set_method |
824 | DSA_sign | 826 | DSA_sign |
825 | DSA_sign_setup | 827 | DSA_sign_setup |
826 | DSA_size | 828 | DSA_size |
829 | DSA_test_flags | ||
827 | DSA_up_ref | 830 | DSA_up_ref |
828 | DSA_verify | 831 | DSA_verify |
829 | DSAparams_dup | 832 | DSAparams_dup |
diff --git a/src/lib/libcrypto/dsa/dsa.h b/src/lib/libcrypto/dsa/dsa.h index 20db7f91c1..6d618113fd 100644 --- a/src/lib/libcrypto/dsa/dsa.h +++ b/src/lib/libcrypto/dsa/dsa.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dsa.h,v 1.26 2018/02/18 14:58:12 tb Exp $ */ | 1 | /* $OpenBSD: dsa.h,v 1.27 2018/02/20 17:45:44 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -262,6 +262,9 @@ void DSA_get0_pqg(const DSA *d, const BIGNUM **p, const BIGNUM **q, | |||
262 | int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g); | 262 | int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g); |
263 | void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key); | 263 | void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key); |
264 | int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key); | 264 | int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key); |
265 | void DSA_clear_flags(DSA *d, int flags); | ||
266 | int DSA_test_flags(const DSA *d, int flags); | ||
267 | void DSA_set_flags(DSA *d, int flags); | ||
265 | 268 | ||
266 | #define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \ | 269 | #define EVP_PKEY_CTX_set_dsa_paramgen_bits(ctx, nbits) \ |
267 | EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \ | 270 | EVP_PKEY_CTX_ctrl(ctx, EVP_PKEY_DSA, EVP_PKEY_OP_PARAMGEN, \ |
diff --git a/src/lib/libcrypto/dsa/dsa_lib.c b/src/lib/libcrypto/dsa/dsa_lib.c index 772c939d31..a43b142b6e 100644 --- a/src/lib/libcrypto/dsa/dsa_lib.c +++ b/src/lib/libcrypto/dsa/dsa_lib.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dsa_lib.c,v 1.26 2018/02/18 14:58:12 tb Exp $ */ | 1 | /* $OpenBSD: dsa_lib.c,v 1.27 2018/02/20 17:45:44 tb Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -364,3 +364,21 @@ DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key) | |||
364 | 364 | ||
365 | return 1; | 365 | return 1; |
366 | } | 366 | } |
367 | |||
368 | void | ||
369 | DSA_clear_flags(DSA *d, int flags) | ||
370 | { | ||
371 | d->flags &= ~flags; | ||
372 | } | ||
373 | |||
374 | int | ||
375 | DSA_test_flags(const DSA *d, int flags) | ||
376 | { | ||
377 | return d->flags & flags; | ||
378 | } | ||
379 | |||
380 | void | ||
381 | DSA_set_flags(DSA *d, int flags) | ||
382 | { | ||
383 | d->flags |= flags; | ||
384 | } | ||