diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-03-12 10:57:56 +0000 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2003-03-12 10:57:56 +0000 |
| commit | f2b8289f8cc87c07b54714859fee9c6e053717bf (patch) | |
| tree | 69a0cdb436b0f4303dd7b93be27073f677d7bd6e /libextra | |
| parent | edb61853219e078ae2d478d998a8ed06315c68f5 (diff) | |
| download | gnutls-f2b8289f8cc87c07b54714859fee9c6e053717bf.tar.gz | |
* Added ability to generate RSA keys.
* Increased the maximum parameter size in order to read some large keys
by some CAs. Patch by Ian Peters <itp@ximian.com>.
* Rolled back some of yesterdays changes. The gnutls_x509_privkey, was
replaced (again) by the gnutls_privkey.
Diffstat (limited to 'libextra')
| -rw-r--r-- | libextra/auth_srp_rsa.c | 2 | ||||
| -rw-r--r-- | libextra/gnutls_openpgp.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/libextra/auth_srp_rsa.c b/libextra/auth_srp_rsa.c index ecabeb4437..750e5cfd45 100644 --- a/libextra/auth_srp_rsa.c +++ b/libextra/auth_srp_rsa.c @@ -81,7 +81,7 @@ ssize_t ret, data_size; gnutls_datum signature, ddata; const gnutls_certificate_credentials cred; gnutls_cert *apr_cert_list; -gnutls_private_key *apr_pkey; +gnutls_privkey *apr_pkey; int apr_cert_list_length; ret = _gnutls_gen_srp_server_kx( session, data); diff --git a/libextra/gnutls_openpgp.c b/libextra/gnutls_openpgp.c index fb8f447140..bd7341bd51 100644 --- a/libextra/gnutls_openpgp.c +++ b/libextra/gnutls_openpgp.c @@ -335,7 +335,7 @@ openpgp_pk_to_gnutls_cert( gnutls_cert *cert, cdkPKT_public_key *pk ) * GnuTLS specific data which is need to perform secret key operations. -*/ int -_gnutls_openpgp_key2gnutls_key( gnutls_private_key *pkey, +_gnutls_openpgp_key2gnutls_key( gnutls_privkey *pkey, gnutls_datum *raw_key ) { CDK_KBNODE snode; @@ -568,7 +568,7 @@ gnutls_certificate_set_openpgp_key_mem( gnutls_certificate_credentials res, i = 1; while( (p = cdk_kbnode_walk( knode, &ctx, 0 )) ) { pkt = cdk_kbnode_get_packet( p ); - if( i > MAX_PARAMS_SIZE ) + if( i > MAX_PUBLIC_PARAMS_SIZE ) break; if( pkt->pkttype == CDK_PKT_PUBLIC_KEY ) { int n = res->ncerts; @@ -586,7 +586,7 @@ gnutls_certificate_set_openpgp_key_mem( gnutls_certificate_credentials res, res->ncerts++; res->pkey = gnutls_realloc_fast(res->pkey, - (res->ncerts)*sizeof(gnutls_private_key)); + (res->ncerts)*sizeof(gnutls_privkey)); if( !res->pkey ) { gnutls_assert(); return GNUTLS_E_MEMORY_ERROR; @@ -673,7 +673,7 @@ gnutls_certificate_set_openpgp_key_file( gnutls_certificate_credentials res, i = 1; rc = cdk_keydb_get_keyblock( inp, &knode ); while( knode && (p = cdk_kbnode_walk( knode, &ctx, 0 )) ) { - if( i > MAX_PARAMS_SIZE ) + if( i > MAX_PUBLIC_PARAMS_SIZE ) break; pkt = cdk_kbnode_get_packet( p ); if( pkt->pkttype == CDK_PKT_PUBLIC_KEY ) { @@ -710,7 +710,7 @@ gnutls_certificate_set_openpgp_key_file( gnutls_certificate_credentials res, stream_to_datum( inp, &raw ); cdk_stream_close( inp ); - n = (res->ncerts + 1) * sizeof (gnutls_private_key); + n = (res->ncerts + 1) * sizeof (gnutls_privkey); res->pkey = gnutls_realloc_fast( res->pkey, n ); if( !res->pkey ) { gnutls_assert(); @@ -1942,7 +1942,7 @@ void gnutls_openpgp_set_recv_key_function( gnutls_session session, #else /*!HAVE_LIBOPENCDK*/ int -_gnutls_openpgp_key2gnutls_key( gnutls_private_key *pkey, +_gnutls_openpgp_key2gnutls_key( gnutls_privkey *pkey, gnutls_datum raw_key ) { return GNUTLS_E_UNIMPLEMENTED_FEATURE; |