diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-09-07 22:20:10 +0200 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2016-09-07 22:25:17 +0200 |
| commit | 25ff70da074d92937a20ddb8d59a59f095710798 (patch) | |
| tree | 56f84c42dc54fbf2a0366f6d2f2d8797e570e2f6 | |
| parent | 0deb92b82207113584c4defc7c66313a80b105fc (diff) | |
| download | gnutls-25ff70da074d92937a20ddb8d59a59f095710798.tar.gz | |
doc update
| -rw-r--r-- | NEWS | 10 | ||||
| -rw-r--r-- | lib/x509/ip.c | 4 |
2 files changed, 8 insertions, 6 deletions
@@ -11,13 +11,15 @@ See the end for copying conditions. ** libgnutls: Added support for IP name constraints. Patch by Martin Ukrop. +** libgnutls: Added support of PKCS#8 file decryption using DES-CBC-MD5. This + is added to allow decryption of PKCS #8 private keys from openssl prior to 1.1.0. + ** libgnutls: Added support for decrypting PKCS#8 files which use HMAC-SHA256 - as PRF. + as PRF. This allow decrypting PKCS #8 private keys generated with openssl 1.1.0. ** libgnutls: Added support for internationalized passwords in PKCS#12 files. - -** libgnutls: Added support of PKCS#8 file decryption using DES-CBC-MD5. This - is added to allow decryption of PKCS #8 private keys from openssl prior to 1.1.0. + Previous versions would only encrypt or decrypt using passwords from the ASCII + set. ** libgnutls: Addressed issue with PKCS#11 signature generation on ECDSA keys. The signature is now written as unsigned integers into the DSASignatureValue diff --git a/lib/x509/ip.c b/lib/x509/ip.c index 60a31203c1..98064e3c0e 100644 --- a/lib/x509/ip.c +++ b/lib/x509/ip.c @@ -185,8 +185,8 @@ int _gnutls_mask_ip(unsigned char *ip, const unsigned char *mask, unsigned ipsiz /** * gnutls_x509_cidr_to_rfc5280: - * @param cidr CIDR in RFC4632 format (IP/prefix), null-terminated - * @param cidr_rfc5280 CIDR range converted to RFC5280 format + * @cidr: CIDR in RFC4632 format (IP/prefix), null-terminated + * @cidr_rfc5280: CIDR range converted to RFC5280 format * * This function will convert text CIDR range with prefix (such as '10.0.0.0/8') * to RFC5280 (IP address in network byte order followed by its network mask). |