diff options
| author | Niels Möller <nisse@lysator.liu.se> | 2009-10-19 10:37:49 +0200 |
|---|---|---|
| committer | Niels Möller <nisse@lysator.liu.se> | 2009-10-19 10:37:49 +0200 |
| commit | e218daf9c90329c02b3abaccf98a659a1d0e9469 (patch) | |
| tree | 4516f3395af3db1e5d393dbdafffb50ec8d42091 /dsa.h | |
| parent | 468100008c05eeed344ff11f3120879604998fc4 (diff) | |
| download | nettle-e218daf9c90329c02b3abaccf98a659a1d0e9469.tar.gz | |
* tools/pkcs1-conv.c: Updated for dsa/der interface change.
* der2dsa.c (dsa_public_key_from_der_iterators): Split into two
new functions...
(dsa_params_from_der_iterator): New function.
(dsa_public_key_from_der_iterator): New function.
(dsa_openssl_private_key_from_der_iterator): Renamed, was
dsa_private_key_from_der_iterator.
(dsa_openssl_private_key_from_der): Likewise.
* dsa.h: Corresponding changees to prototypes and #defines.
Rev: nettle/ChangeLog:1.45
Rev: nettle/der2dsa.c:1.3
Rev: nettle/dsa.h:1.3
Rev: nettle/tools/pkcs1-conv.c:1.3
Diffstat (limited to 'dsa.h')
| -rw-r--r-- | dsa.h | 35 |
1 files changed, 19 insertions, 16 deletions
@@ -55,9 +55,10 @@ extern "C" { #define dsa_keypair_to_sexp nettle_dsa_keypair_to_sexp #define dsa_keypair_from_sexp_alist nettle_dsa_keypair_from_sexp_alist #define dsa_keypair_from_sexp nettle_dsa_keypair_from_sexp -#define dsa_public_key_from_der_iterators nettle_dsa_public_key_from_der_iterators -#define dsa_private_key_from_der_iterator nettle_dsa_private_key_from_der_iterator -#define dsa_keypair_from_der nettle_dsa_keypair_from_der +#define dsa_params_from_der_iterator nettle_dsa_params_from_der_iterator +#define dsa_public_key_from_der_iterator nettle_dsa_public_key_from_der_iterator +#define dsa_openssl_private_key_from_der_iterator nettle_dsa_openssl_private_key_from_der_iterator +#define dsa_openssl_private_key_from_der nettle_openssl_provate_key_from_der #define DSA_MIN_P_BITS 512 #define DSA_Q_OCTETS 20 @@ -213,23 +214,25 @@ dsa_keypair_from_sexp(struct dsa_public_key *pub, struct asn1_der_iterator; int -dsa_public_key_from_der_iterators(struct dsa_public_key *pub, - unsigned limit, - struct asn1_der_iterator *i, - struct asn1_der_iterator *j); +dsa_params_from_der_iterator(struct dsa_public_key *pub, + unsigned limit, + struct asn1_der_iterator *i); +int +dsa_public_key_from_der_iterator(struct dsa_public_key *pub, + unsigned limit, + struct asn1_der_iterator *i); int -dsa_private_key_from_der_iterator(struct dsa_public_key *pub, - struct dsa_private_key *priv, - unsigned limit, - struct asn1_der_iterator *i); +dsa_openssl_private_key_from_der_iterator(struct dsa_public_key *pub, + struct dsa_private_key *priv, + unsigned limit, + struct asn1_der_iterator *i); -/* For public keys, use PRIV == NULL */ int -dsa_keypair_from_der(struct dsa_public_key *pub, - struct dsa_private_key *priv, - unsigned limit, - unsigned length, const uint8_t *data); +dsa_openssl_private_key_from_der(struct dsa_public_key *pub, + struct dsa_private_key *priv, + unsigned limit, + unsigned length, const uint8_t *data); #ifdef __cplusplus |