summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortb <>2018-02-20 17:45:44 +0000
committertb <>2018-02-20 17:45:44 +0000
commit90a2cac2c9296c6001b956f786252ce7b31af437 (patch)
tree800b6a84ca7bb475426a66249adbaf245110e320 /src
parente6e87dba22757a3b4937ac796bb40b817e71a3d3 (diff)
downloadopenbsd-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.list3
-rw-r--r--src/lib/libcrypto/dsa/dsa.h5
-rw-r--r--src/lib/libcrypto/dsa/dsa_lib.c20
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
800DSA_SIG_free 800DSA_SIG_free
801DSA_SIG_it 801DSA_SIG_it
802DSA_SIG_new 802DSA_SIG_new
803DSA_clear_flags
803DSA_do_sign 804DSA_do_sign
804DSA_do_verify 805DSA_do_verify
805DSA_dup_DH 806DSA_dup_DH
@@ -820,10 +821,12 @@ DSA_set0_key
820DSA_set0_pqg 821DSA_set0_pqg
821DSA_set_default_method 822DSA_set_default_method
822DSA_set_ex_data 823DSA_set_ex_data
824DSA_set_flags
823DSA_set_method 825DSA_set_method
824DSA_sign 826DSA_sign
825DSA_sign_setup 827DSA_sign_setup
826DSA_size 828DSA_size
829DSA_test_flags
827DSA_up_ref 830DSA_up_ref
828DSA_verify 831DSA_verify
829DSAparams_dup 832DSAparams_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,
262int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g); 262int DSA_set0_pqg(DSA *d, BIGNUM *p, BIGNUM *q, BIGNUM *g);
263void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key); 263void DSA_get0_key(const DSA *d, const BIGNUM **pub_key, const BIGNUM **priv_key);
264int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key); 264int DSA_set0_key(DSA *d, BIGNUM *pub_key, BIGNUM *priv_key);
265void DSA_clear_flags(DSA *d, int flags);
266int DSA_test_flags(const DSA *d, int flags);
267void 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
368void
369DSA_clear_flags(DSA *d, int flags)
370{
371 d->flags &= ~flags;
372}
373
374int
375DSA_test_flags(const DSA *d, int flags)
376{
377 return d->flags & flags;
378}
379
380void
381DSA_set_flags(DSA *d, int flags)
382{
383 d->flags |= flags;
384}