[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-243-g751a075
|
From: |
Nikos Mavrogiannopoulos |
|
Subject: |
[SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-243-g751a075 |
|
Date: |
Wed, 23 Feb 2011 17:53:05 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".
http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=751a07546063e2c68c2ea15ce027d97e90d6f05c
The branch, master has been updated
via 751a07546063e2c68c2ea15ce027d97e90d6f05c (commit)
via 9594cae53b92e8ea1f0aaca1713c75a0368885cf (commit)
via 6c70bd5c58d52e60545f94c5d0a9e843b93aaac2 (commit)
via 554e585799f7fc16e2c9ca9e263122bb712cb9fd (commit)
via 56fefb327854e6951dcf6f3e4ff939af5ec72b59 (commit)
via 36f18a572d5e3f944d9aef8f88863d18ddda4f78 (commit)
via 6c664c4dca9b35491aef225d3570ab52e6e955bc (commit)
via 388da0c8d88b7bbd5f91e877356b63195c3ddded (commit)
via 88594ea683b76ee842c95f4216c7bc01e251cd9d (commit)
via 555645c74435cf375e1a489648927267a60b4333 (commit)
via 5babe52f4a7097a8e480b002a6b28a12ae8a7ff4 (commit)
via 797a723e22c8b1749cd703513a3c62198f34f38e (commit)
via e921d00a22a41e7c9222196135b7c4629660097b (commit)
via e61daf0ad9b98b02cb9a998065b4aaa8ed0e50be (commit)
via 33b63e42105aef20f19cea036b348dec545e51ba (commit)
via 4f28ae7011adc75ed1386c768c0d4c639616201c (commit)
via 23f615e03b5ca8427df89217353eee8313f420e0 (commit)
via 773267f7fdcc9ce209bb2735c325765b27bc742e (commit)
via 9ed56e762c24390c8ce8254af864518eb781f2c7 (commit)
via 84bc7d77d2332851de150c2f6ad34d8daaf270ed (commit)
via a1952187b47110c7ad8f262c2b1631cbc94a9457 (commit)
from 712c124a8c9340a981295de656555de2647dfe46 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 751a07546063e2c68c2ea15ce027d97e90d6f05c
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 20:59:56 2011 +0100
Remove gnutls_x509_crq_get_preferred_hash_algorithm.
commit 9594cae53b92e8ea1f0aaca1713c75a0368885cf
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 20:43:05 2011 +0100
Remove dropped functions.
commit 6c70bd5c58d52e60545f94c5d0a9e843b93aaac2
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 20:44:52 2011 +0100
Add deprecated docstring.
commit 554e585799f7fc16e2c9ca9e263122bb712cb9fd
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 20:45:48 2011 +0100
Fix deprecated docstring.
commit 56fefb327854e6951dcf6f3e4ff939af5ec72b59
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 20:48:05 2011 +0100
Fix docstring.
commit 36f18a572d5e3f944d9aef8f88863d18ddda4f78
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:44:15 2011 +0100
Fix docstring of new function.
commit 6c664c4dca9b35491aef225d3570ab52e6e955bc
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:55:53 2011 +0100
Fix docstring for deprecated functions.
commit 388da0c8d88b7bbd5f91e877356b63195c3ddded
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:39:59 2011 +0100
Make it build.
commit 88594ea683b76ee842c95f4216c7bc01e251cd9d
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:40:30 2011 +0100
Fix docstring of deprecated function.
commit 555645c74435cf375e1a489648927267a60b4333
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:42:14 2011 +0100
Fix docstrinf of new function.
commit 5babe52f4a7097a8e480b002a6b28a12ae8a7ff4
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:42:32 2011 +0100
Fix typo.
commit 797a723e22c8b1749cd703513a3c62198f34f38e
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:42:58 2011 +0100
Improve text.
commit e921d00a22a41e7c9222196135b7c4629660097b
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:37:49 2011 +0100
Doc fix of new function.
commit e61daf0ad9b98b02cb9a998065b4aaa8ed0e50be
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:07:51 2011 +0100
Fix docstring of deprecated functions.
commit 33b63e42105aef20f19cea036b348dec545e51ba
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 19:30:02 2011 +0100
Rename gnutls_privkey_sign_data2 to gnutls_privkey_sign_data and
gnutls_privkey_sign_hash2 to gnutls_privkey_sign_hash.
These were added during the 2.11 cycle where we don't promise ABI
compatibility.
commit 4f28ae7011adc75ed1386c768c0d4c639616201c
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 17:34:52 2011 +0100
Add doc/gnutls-crypto-layers.eps.
commit 23f615e03b5ca8427df89217353eee8313f420e0
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 17:34:15 2011 +0100
Dist gnutls-crypto-layers.*.
commit 773267f7fdcc9ce209bb2735c325765b27bc742e
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 17:29:35 2011 +0100
Add abstract_int.h.
commit 9ed56e762c24390c8ce8254af864518eb781f2c7
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 16:42:31 2011 +0100
Ignore more.
commit 84bc7d77d2332851de150c2f6ad34d8daaf270ed
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 16:48:10 2011 +0100
Link with -lnettle too.
commit a1952187b47110c7ad8f262c2b1631cbc94a9457
Author: Simon Josefsson <address@hidden>
Date: Sun Feb 20 16:37:22 2011 +0100
Fix syntax-check warnings.
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 2 +
NEWS | 18 +-
doc/Makefile.am | 23 ++-
doc/cha-programs.texi | 1 -
doc/gnutls-crypto-layers.eps | 424 ++++++++++++++++++++++++++++++++++++++++
doc/manpages/Makefile.am | 1 -
doc/reference/gnutls-docs.sgml | 6 +-
lib/Makefile.am | 20 +-
lib/gnutls_cert.c | 12 +-
lib/gnutls_privkey.c | 21 ++-
lib/gnutls_pubkey.c | 13 +-
lib/gnutls_sig.c | 2 +-
lib/includes/gnutls/abstract.h | 13 +-
lib/includes/gnutls/compat.h | 11 +-
lib/includes/gnutls/x509.h | 1 -
lib/libgnutls.map | 9 +-
lib/openpgp/pgp.c | 1 -
lib/openpgp/privkey.c | 6 +-
lib/x509/crl.c | 10 +-
lib/x509/crl_write.c | 10 +-
lib/x509/crq.c | 81 +-------
lib/x509/privkey.c | 20 +-
lib/x509/sign.c | 2 +-
tests/x509sign-verify.c | 12 +-
24 files changed, 541 insertions(+), 178 deletions(-)
create mode 100644 doc/gnutls-crypto-layers.eps
diff --git a/.gitignore b/.gitignore
index 24ba213..d286453 100644
--- a/.gitignore
+++ b/.gitignore
@@ -136,6 +136,7 @@ gl/tests/Makefile
gl/tests/Makefile.in
gl/tests/arg-nonnull.h
gl/tests/c++defs.h
+gl/tests/fcntl.h
gl/tests/libtests.a
gl/tests/sys/
gl/tests/test-alignof
@@ -231,6 +232,7 @@ lib/gl/tests/Makefile
lib/gl/tests/Makefile.in
lib/gl/tests/arg-nonnull.h
lib/gl/tests/c++defs.h
+lib/gl/tests/fcntl.h
lib/gl/tests/libtests.a
lib/gl/tests/test-alloca-opt
lib/gl/tests/test-binary-io
diff --git a/NEWS b/NEWS
index 819b03c..ae47f2d 100644
--- a/NEWS
+++ b/NEWS
@@ -89,14 +89,14 @@ checking.
** libgnutls: Added helper functions for signature verification:
gnutls_pubkey_verify_data() and gnutls_pubkey_import_privkey().
-** libgnutls: Added gnutls_privkey_sign_hash2().
+** libgnutls: Modified gnutls_privkey_sign_data().
** gnutls_x509_crl_privkey_sign2(), gnutls_x509_crq_sign2()
-gnutls_x509_privkey_sign_hash(), gnutls_x509_privkey_sign_data(),
-gnutls_x509_crt_verify_hash(), gnutls_x509_crt_verify_data(),
-were deprecated for gnutls_x509_crl_privkey_sign(),
-gnutls_x509_crq_privkey_sign(), gnutls_privkey_sign_hash2(),
-gnutls_privkey_sign_data2(), gnutls_pubkey_verify_hash()
+gnutls_x509_privkey_sign_hash(), gnutls_x509_privkey_sign_data(),
+gnutls_x509_crt_verify_hash(), gnutls_x509_crt_verify_data(), were
+deprecated for gnutls_x509_crl_privkey_sign(),
+gnutls_x509_crq_privkey_sign(), gnutls_privkey_sign_hash(),
+gnutls_privkey_sign_data(), gnutls_pubkey_verify_hash()
gnutls_pubkey_verify_data() respectively.
** libgnutls: gnutls_*_export_raw() functions now add leading zero in
@@ -120,11 +120,11 @@ gnutls_x509_trust_list_deinit: ADDED
gnutls_x509_crl_get_raw_issuer_dn: ADDED
gnutls_pubkey_import_privkey: ADDED
gnutls_pubkey_verify_data: ADDED
-gnutls_privkey_sign_hash2: ADDED
-gnutls_privkey_sign_data2: ADDED (in place of gnutls_privkey_sign_data)
+gnutls_privkey_sign_hash: MODIFIED (was added in 2.11.0)
+gnutls_privkey_sign_data: MODIFIED (was added in 2.11.0)
gnutls_x509_crq_sign2: DEPRECATED (use: gnutls_x509_crq_privkey_sign)
gnutls_x509_crq_sign: DEPRECATED (use: gnutls_x509_crq_privkey_sign)
-gnutls_x509_crq_get_preferred_hash_algorithm: DEPRECATED
+gnutls_x509_crq_get_preferred_hash_algorithm: REMOVED (was added in 2.11.0)
gnutls_x509_crl_sign: DEPRECATED (use: gnutls_x509_crl_privkey_sign)
gnutls_x509_crl_sign2: DEPRECATED (use: gnutls_x509_crl_privkey_sign)
gnutls_x509_privkey_sign_data: DEPRECATED (use: gnutls_privkey_sign_data2)
diff --git a/doc/Makefile.am b/doc/Makefile.am
index f1b1002..8770e62 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -20,9 +20,8 @@
# along with this file; if not, write to the Free Software Foundation,
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-EXTRA_DIST = TODO certtool.cfg gnutls.ps gnutls.pdf \
- gnutls.html doxygen/Doxyfile.in doxygen/Doxyfile.orig \
- texinfo.css
+EXTRA_DIST = TODO certtool.cfg gnutls.ps gnutls.pdf gnutls.html \
+ doxygen/Doxyfile.in doxygen/Doxyfile.orig texinfo.css
SUBDIRS = examples cyclo scripts manpages credentials
if ENABLE_GTK_DOC
@@ -30,19 +29,19 @@ SUBDIRS += reference
endif
info_TEXINFOS = gnutls.texi
-gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi lgpl-2.1.texi gpl-3.0.texi \
- cha-auth.texi cha-bib.texi cha-cert-auth.texi cha-ciphersuites.texi \
- cha-copying.texi cha-functions.texi cha-gtls-app.texi \
- cha-internals.texi cha-intro-tls.texi cha-library.texi \
- cha-preface.texi cha-programs.texi cha-tls-app.texi
+gnutls_TEXINFOS = gnutls.texi fdl-1.3.texi lgpl-2.1.texi gpl-3.0.texi \
+ cha-auth.texi cha-bib.texi cha-cert-auth.texi \
+ cha-ciphersuites.texi cha-copying.texi cha-functions.texi \
+ cha-gtls-app.texi cha-internals.texi cha-intro-tls.texi \
+ cha-library.texi cha-preface.texi cha-programs.texi \
+ cha-tls-app.texi
# Examples.
gnutls_TEXINFOS += examples/ex-client1.c examples/ex-client2.c \
examples/ex-session-info.c examples/ex-verify.c \
examples/ex-cert-select.c examples/ex-client-resume.c \
- examples/ex-client-srp.c \
- examples/ex-rfc2818.c examples/ex-serv1.c \
- examples/ex-serv-anon.c \
+ examples/ex-client-srp.c examples/ex-rfc2818.c \
+ examples/ex-serv1.c examples/ex-serv-anon.c \
examples/ex-serv-pgp.c examples/ex-serv-srp.c \
examples/ex-alert.c examples/ex-x509-info.c examples/ex-crq.c \
examples/ex-pkcs12.c
@@ -52,6 +51,8 @@ gnutls_TEXINFOS += gnutls-internals.dia gnutls-internals.eps
\
gnutls-internals.png gnutls-internals.pdf
gnutls_TEXINFOS += gnutls-layers.dia gnutls-layers.eps \
gnutls-layers.png gnutls-layers.pdf
+gnutls_TEXINFOS += gnutls-crypto-layers.dia gnutls-crypto-layers.eps \
+ gnutls-crypto-layers.png gnutls-crypto-layers.pdf
gnutls_TEXINFOS += gnutls-pgp.dia gnutls-pgp.eps gnutls-pgp.png
\
gnutls-pgp.pdf
gnutls_TEXINFOS += gnutls-x509.dia gnutls-x509.eps gnutls-x509.png \
diff --git a/doc/cha-programs.texi b/doc/cha-programs.texi
index 53a7195..2f44e83 100644
--- a/doc/cha-programs.texi
+++ b/doc/cha-programs.texi
@@ -935,4 +935,3 @@ $ p11tool --login --write pkcs11:(TOKEN URL)
--load-certificate (certificate fil
Note that typically PKCS #11 private key objects are not allowed
to be extracted from the token.
-
diff --git a/doc/gnutls-crypto-layers.eps b/doc/gnutls-crypto-layers.eps
new file mode 100644
index 0000000..6f71f94
--- /dev/null
+++ b/doc/gnutls-crypto-layers.eps
@@ -0,0 +1,424 @@
+%!PS-Adobe-2.0 EPSF-2.0
+%%Title: /home/jas/src/gnutls-2.12/doc/gnutls-crypto-layers.dia
+%%Creator: Dia v0.97.1
+%%CreationDate: Sun Feb 20 17:25:49 2011
+%%For: jas
+%%Orientation: Portrait
+%%Magnification: 1.0000
+%%BoundingBox: 0 0 557 479
+%%BeginSetup
+%%EndSetup
+%%EndComments
+%%BeginProlog
+[ /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef
+/.notdef /.notdef /space /exclam /quotedbl /numbersign /dollar /percent
/ampersand /quoteright
+/parenleft /parenright /asterisk /plus /comma /hyphen /period /slash /zero /one
+/two /three /four /five /six /seven /eight /nine /colon /semicolon
+/less /equal /greater /question /at /A /B /C /D /E
+/F /G /H /I /J /K /L /M /N /O
+/P /Q /R /S /T /U /V /W /X /Y
+/Z /bracketleft /backslash /bracketright /asciicircum /underscore /quoteleft
/a /b /c
+/d /e /f /g /h /i /j /k /l /m
+/n /o /p /q /r /s /t /u /v /w
+/x /y /z /braceleft /bar /braceright /asciitilde /.notdef /.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef
+/.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef /.notdef
/.notdef /.notdef
+/space /exclamdown /cent /sterling /currency /yen /brokenbar /section
/dieresis /copyright
+/ordfeminine /guillemotleft /logicalnot /hyphen /registered /macron /degree
/plusminus /twosuperior /threesuperior
+/acute /mu /paragraph /periodcentered /cedilla /onesuperior /ordmasculine
/guillemotright /onequarter /onehalf
+/threequarters /questiondown /Agrave /Aacute /Acircumflex /Atilde /Adieresis
/Aring /AE /Ccedilla
+/Egrave /Eacute /Ecircumflex /Edieresis /Igrave /Iacute /Icircumflex
/Idieresis /Eth /Ntilde
+/Ograve /Oacute /Ocircumflex /Otilde /Odieresis /multiply /Oslash /Ugrave
/Uacute /Ucircumflex
+/Udieresis /Yacute /Thorn /germandbls /agrave /aacute /acircumflex /atilde
/adieresis /aring
+/ae /ccedilla /egrave /eacute /ecircumflex /edieresis /igrave /iacute
/icircumflex /idieresis
+/eth /ntilde /ograve /oacute /ocircumflex /otilde /odieresis /divide /oslash
/ugrave
+/uacute /ucircumflex /udieresis /yacute /thorn /ydieresis] /isolatin1encoding
exch def
+/cp {closepath} bind def
+/c {curveto} bind def
+/f {fill} bind def
+/a {arc} bind def
+/ef {eofill} bind def
+/ex {exch} bind def
+/gr {grestore} bind def
+/gs {gsave} bind def
+/sa {save} bind def
+/rs {restore} bind def
+/l {lineto} bind def
+/m {moveto} bind def
+/rm {rmoveto} bind def
+/n {newpath} bind def
+/s {stroke} bind def
+/sh {show} bind def
+/slc {setlinecap} bind def
+/slj {setlinejoin} bind def
+/slw {setlinewidth} bind def
+/srgb {setrgbcolor} bind def
+/rot {rotate} bind def
+/sc {scale} bind def
+/sd {setdash} bind def
+/ff {findfont} bind def
+/sf {setfont} bind def
+/scf {scalefont} bind def
+/sw {stringwidth pop} bind def
+/tr {translate} bind def
+
+/ellipsedict 8 dict def
+ellipsedict /mtrx matrix put
+/ellipse
+{ ellipsedict begin
+ /endangle exch def
+ /startangle exch def
+ /yrad exch def
+ /xrad exch def
+ /y exch def
+ /x exch def /savematrix mtrx currentmatrix def
+ x y tr xrad yrad sc
+ 0 0 1 startangle endangle arc
+ savematrix setmatrix
+ end
+} def
+
+/mergeprocs {
+dup length
+3 -1 roll
+dup
+length
+dup
+5 1 roll
+3 -1 roll
+add
+array cvx
+dup
+3 -1 roll
+0 exch
+putinterval
+dup
+4 2 roll
+putinterval
+} bind def
+/Times-Roman-latin1
+ /Times-Roman findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Times-Italic-latin1
+ /Times-Italic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Times-Bold-latin1
+ /Times-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Times-BoldItalic-latin1
+ /Times-BoldItalic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/AvantGarde-Gothic-latin1
+ /AvantGarde-Gothic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/AvantGarde-BookOblique-latin1
+ /AvantGarde-BookOblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/AvantGarde-Demi-latin1
+ /AvantGarde-Demi findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/AvantGarde-DemiOblique-latin1
+ /AvantGarde-DemiOblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Bookman-Light-latin1
+ /Bookman-Light findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Bookman-LightItalic-latin1
+ /Bookman-LightItalic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Bookman-Demi-latin1
+ /Bookman-Demi findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Bookman-DemiItalic-latin1
+ /Bookman-DemiItalic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Courier-latin1
+ /Courier findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Courier-Oblique-latin1
+ /Courier-Oblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Courier-Bold-latin1
+ /Courier-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Courier-BoldOblique-latin1
+ /Courier-BoldOblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-latin1
+ /Helvetica findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-Oblique-latin1
+ /Helvetica-Oblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-Bold-latin1
+ /Helvetica-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-BoldOblique-latin1
+ /Helvetica-BoldOblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-Narrow-latin1
+ /Helvetica-Narrow findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-Narrow-Oblique-latin1
+ /Helvetica-Narrow-Oblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-Narrow-Bold-latin1
+ /Helvetica-Narrow-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Helvetica-Narrow-BoldOblique-latin1
+ /Helvetica-Narrow-BoldOblique findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-Roman-latin1
+ /NewCenturySchlbk-Roman findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-Italic-latin1
+ /NewCenturySchlbk-Italic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-Bold-latin1
+ /NewCenturySchlbk-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/NewCenturySchlbk-BoldItalic-latin1
+ /NewCenturySchlbk-BoldItalic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Palatino-Roman-latin1
+ /Palatino-Roman findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Palatino-Italic-latin1
+ /Palatino-Italic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Palatino-Bold-latin1
+ /Palatino-Bold findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Palatino-BoldItalic-latin1
+ /Palatino-BoldItalic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/Symbol-latin1
+ /Symbol findfont
+definefont pop
+/ZapfChancery-MediumItalic-latin1
+ /ZapfChancery-MediumItalic findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+/ZapfDingbats-latin1
+ /ZapfDingbats findfont
+ dup length dict begin
+ {1 index /FID ne {def} {pop pop} ifelse} forall
+ /Encoding isolatin1encoding def
+ currentdict end
+definefont pop
+28.346000 -28.346000 scale
+-5.400000 -25.425000 translate
+%%EndProlog
+
+
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 6.600000 10.040000 m 6.600000 9.700000 23.850100 9.700000 23.850100
10.040000 c 23.850100 12.760000 l 23.850100 13.100000 6.600000 13.100000
6.600000 12.760000 c 6.600000 10.040000 l ef
+0.000000 0.000000 0.000000 srgb
+n 6.600000 10.040000 m 6.600000 9.700000 23.850100 9.700000 23.850100
10.040000 c 23.850100 12.760000 l 23.850100 13.100000 6.600000 13.100000
6.600000 12.760000 c 6.600000 10.040000 l s
+n 6.600000 10.040000 m 6.600000 10.380000 23.850100 10.380000 23.850100
10.040000 c 23.850100 12.760000 l s
+/Helvetica-latin1 ff 0.560000 scf sf
+(TLS layer) 7.100000 11.315000 m
+ gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 6.550000 13.471429 m 6.550000 13.100000 23.850000 13.100000 23.850000
13.471429 c 23.850000 16.442857 l 23.850000 16.814286 6.550000 16.814286
6.550000 16.442857 c 6.550000 13.471429 l ef
+0.000000 0.000000 0.000000 srgb
+n 6.550000 13.471429 m 6.550000 13.100000 23.850000 13.100000 23.850000
13.471429 c 23.850000 16.442857 l 23.850000 16.814286 6.550000 16.814286
6.550000 16.442857 c 6.550000 13.471429 l s
+n 6.550000 13.471429 m 6.550000 13.842857 23.850000 13.842857 23.850000
13.471429 c 23.850000 16.442857 l s
+/Helvetica-latin1 ff 0.560000 scf sf
+(Cryptography) 7.050000 14.777857 m
+ gs 1 -1 sc sh gr
+(Provider Layer) 7.050000 15.577857 m
+ gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 6.600000 17.271429 m 6.600000 16.900000 15.000000 16.900000 15.000000
17.271429 c 15.000000 20.242857 l 15.000000 20.614286 6.600000 20.614286
6.600000 20.242857 c 6.600000 17.271429 l ef
+0.000000 0.000000 0.000000 srgb
+n 6.600000 17.271429 m 6.600000 16.900000 15.000000 16.900000 15.000000
17.271429 c 15.000000 20.242857 l 15.000000 20.614286 6.600000 20.614286
6.600000 20.242857 c 6.600000 17.271429 l s
+n 6.600000 17.271429 m 6.600000 17.642857 15.000000 17.642857 15.000000
17.271429 c 15.000000 20.242857 l s
+/Helvetica-latin1 ff 0.560000 scf sf
+(Cryptographic) 7.100000 18.577857 m
+ gs 1 -1 sc sh gr
+(Library) 7.100000 19.377857 m
+ gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 15.450000 17.271429 m 15.450000 16.900000 23.875100 16.900000 23.875100
17.271429 c 23.875100 20.242857 l 23.875100 20.614286 15.450000 20.614286
15.450000 20.242857 c 15.450000 17.271429 l ef
+0.000000 0.000000 0.000000 srgb
+n 15.450000 17.271429 m 15.450000 16.900000 23.875100 16.900000 23.875100
17.271429 c 23.875100 20.242857 l 23.875100 20.614286 15.450000 20.614286
15.450000 20.242857 c 15.450000 17.271429 l s
+n 15.450000 17.271429 m 15.450000 17.642857 23.875100 17.642857 23.875100
17.271429 c 23.875100 20.242857 l s
+/Helvetica-latin1 ff 0.560000 scf sf
+(External cryptographic) 15.950000 18.577857 m
+ gs 1 -1 sc sh gr
+(provider) 15.950000 19.377857 m
+ gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 17.650000 21.710000 m 17.650000 21.425000 22.307500 21.425000 22.307500
21.710000 c 22.307500 23.990000 l 22.307500 24.275000 17.650000 24.275000
17.650000 23.990000 c 17.650000 21.710000 l ef
+0.000000 0.000000 0.000000 srgb
+n 17.650000 21.710000 m 17.650000 21.425000 22.307500 21.425000 22.307500
21.710000 c 22.307500 23.990000 l 22.307500 24.275000 17.650000 24.275000
17.650000 23.990000 c 17.650000 21.710000 l s
+n 17.650000 21.710000 m 17.650000 21.995000 22.307500 21.995000 22.307500
21.710000 c 22.307500 23.990000 l s
+/Helvetica-latin1 ff 0.560000 scf sf
+(/dev/crypto) 18.150000 22.930000 m
+ gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 6.800100 21.682143 m 6.800100 21.425000 10.622600 21.425000 10.622600
21.682143 c 10.622600 23.739286 l 10.622600 23.996429 6.800100 23.996429
6.800100 23.739286 c 6.800100 21.682143 l ef
+0.000000 0.000000 0.000000 srgb
+n 6.800100 21.682143 m 6.800100 21.425000 10.622600 21.425000 10.622600
21.682143 c 10.622600 23.739286 l 10.622600 23.996429 6.800100 23.996429
6.800100 23.739286 c 6.800100 21.682143 l s
+n 6.800100 21.682143 m 6.800100 21.939286 10.622600 21.939286 10.622600
21.682143 c 10.622600 23.739286 l s
+/Helvetica-latin1 ff 0.560000 scf sf
+(libgcrypt) 7.300100 22.874286 m
+ gs 1 -1 sc sh gr
+0.100000 slw
+[] 0 sd
+1.000000 1.000000 1.000000 srgb
+n 11.225100 21.682143 m 11.225100 21.425000 14.800100 21.425000 14.800100
21.682143 c 14.800100 23.739286 l 14.800100 23.996429 11.225100 23.996429
11.225100 23.739286 c 11.225100 21.682143 l ef
+0.000000 0.000000 0.000000 srgb
+n 11.225100 21.682143 m 11.225100 21.425000 14.800100 21.425000 14.800100
21.682143 c 14.800100 23.739286 l 14.800100 23.996429 11.225100 23.996429
11.225100 23.739286 c 11.225100 21.682143 l s
+n 11.225100 21.682143 m 11.225100 21.939286 14.800100 21.939286 14.800100
21.682143 c 14.800100 23.739286 l s
+/Helvetica-latin1 ff 0.560000 scf sf
+(nettle) 11.725100 22.874286 m
+ gs 1 -1 sc sh gr
+showpage
diff --git a/doc/manpages/Makefile.am b/doc/manpages/Makefile.am
index 340f751..f1f707b 100644
--- a/doc/manpages/Makefile.am
+++ b/doc/manpages/Makefile.am
@@ -439,7 +439,6 @@ APIMANS += gnutls_x509_crq_set_basic_constraints.3
APIMANS += gnutls_x509_crq_set_key_usage.3
APIMANS += gnutls_x509_crq_get_key_purpose_oid.3
APIMANS += gnutls_x509_crq_set_key_purpose_oid.3
-APIMANS += gnutls_x509_crq_get_preferred_hash_algorithm.3
APIMANS += gnutls_x509_crq_get_key_id.3
APIMANS += gnutls_x509_crq_privkey_sign.3
APIMANS += gnutls_x509_dn_init.3
diff --git a/doc/reference/gnutls-docs.sgml b/doc/reference/gnutls-docs.sgml
index beefae5..03d3aa3 100644
--- a/doc/reference/gnutls-docs.sgml
+++ b/doc/reference/gnutls-docs.sgml
@@ -10,8 +10,8 @@
<title>GnuTLS API Reference Manual</title>
<para>
- GnuTLS implements the TLS (Transport Layer Security) and SSL
- (Secure Sockets Layer) protocols for the GNU project.
+ GnuTLS implements the Transport Layer Security (TLS) and Secure
+ Sockets Layer (SSL) protocols for the GNU project.
</para>
<para>
@@ -48,7 +48,7 @@
<index role="2.10.0" id="api-index-2-10-0">
<title>Index of new symbols in 2.10.0</title>
</index>
- <index role="2.10.0" id="api-index-2-12-0">
+ <index role="2.12.0" id="api-index-2-12-0">
<title>Index of new symbols in 2.12.0</title>
</index>
</book>
diff --git a/lib/Makefile.am b/lib/Makefile.am
index edf5209..bea2a25 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -90,20 +90,20 @@ else
SUBDIRS += gcrypt
endif
-HFILES = debug.h gnutls_compress.h gnutls_cipher.h gnutls_buffers.h \
- gnutls_errors.h gnutls_int.h gnutls_handshake.h gnutls_num.h \
- gnutls_algorithms.h gnutls_dh.h gnutls_kx.h gnutls_hash_int.h \
- gnutls_cipher_int.h gnutls_db.h gnutls_auth.h auth_anon.h \
- gnutls_extensions.h x509_b64.h gnutls_v2_compat.h \
- gnutls_datum.h auth_cert.h gnutls_mpi.h gnutls_pk.h \
- gnutls_record.h gnutls_cert.h gnutls_constate.h \
- gnutls_global.h gnutls_sig.h gnutls_mem.h \
+HFILES = abstract_int.h debug.h gnutls_compress.h gnutls_cipher.h \
+ gnutls_buffers.h gnutls_errors.h gnutls_int.h \
+ gnutls_handshake.h gnutls_num.h gnutls_algorithms.h \
+ gnutls_dh.h gnutls_kx.h gnutls_hash_int.h gnutls_cipher_int.h \
+ gnutls_db.h gnutls_auth.h auth_anon.h gnutls_extensions.h \
+ x509_b64.h gnutls_v2_compat.h gnutls_datum.h auth_cert.h \
+ gnutls_mpi.h gnutls_pk.h gnutls_record.h gnutls_cert.h \
+ gnutls_constate.h gnutls_global.h gnutls_sig.h gnutls_mem.h \
ext_max_record.h gnutls_session_pack.h gnutls_str.h \
gnutls_state.h gnutls_x509.h ext_cert_type.h \
gnutls_rsa_export.h ext_server_name.h auth_dh_common.h \
ext_srp.h gnutls_srp.h auth_srp.h auth_srp_passwd.h \
gnutls_helper.h auth_psk.h auth_psk_passwd.h \
- gnutls_supplemental.h crypto.h random.h system.h \
+ gnutls_supplemental.h crypto.h random.h system.h \
ext_session_ticket.h ext_signature.h gnutls_cryptodev.h \
ext_safe_renegotiation.h locks.h gnutls_mbuffers.h pkcs11_int.h \
hash.h
@@ -145,7 +145,7 @@ endif
libgnutls_la_LDFLAGS += $(LTLIBPAKCHOIS)
if ENABLE_NETTLE
-libgnutls_la_LDFLAGS += $(NETTLE_LIBS)
+libgnutls_la_LDFLAGS += $(LTLIBNETTLE) $(NETTLE_LIBS)
libgnutls_la_LIBADD += nettle/libcrypto.la
else
libgnutls_la_LDFLAGS += $(LTLIBGCRYPT)
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index 47f029c..f3cb28a 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -886,7 +886,7 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
_gnutls_free_datum (&cert->raw);
}
-/*-
+/**
* gnutls_sign_callback_set:
* @session: is a gnutls session
* @sign_func: function pointer to application's sign callback.
@@ -905,8 +905,8 @@ _gnutls_gcert_deinit (gnutls_cert * cert)
* can be used to store application-specific data needed in the
* callback function. See also gnutls_sign_callback_get().
*
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated: Use the PKCS 11 interfaces instead.
+ */
void
gnutls_sign_callback_set (gnutls_session_t session,
gnutls_sign_func sign_func, void *userdata)
@@ -915,7 +915,7 @@ gnutls_sign_callback_set (gnutls_session_t session,
session->internals.sign_func_userdata = userdata;
}
-/*-
+/**
* gnutls_sign_callback_get:
* @session: is a gnutls session
* @userdata: if non-%NULL, will be set to abstract callback pointer.
@@ -925,8 +925,8 @@ gnutls_sign_callback_set (gnutls_session_t session,
* Returns: The function pointer set by gnutls_sign_callback_set(), or
* if not set, %NULL.
*
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated: Use the PKCS 11 interfaces instead.
+ */
gnutls_sign_func
gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
{
diff --git a/lib/gnutls_privkey.c b/lib/gnutls_privkey.c
index 083ce11..0ee2d94 100644
--- a/lib/gnutls_privkey.c
+++ b/lib/gnutls_privkey.c
@@ -404,7 +404,7 @@ int ret;
#endif
/**
- * gnutls_privkey_sign_data:
+ * gnutls_privkey_sign_data2:
* @signer: Holds the key
* @digest: should be a digest algorithm
* @flags: should be 0 for now
@@ -418,9 +418,11 @@ int ret;
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
+ *
+ * Since: 2.12.0
**/
int
-gnutls_privkey_sign_data2 (gnutls_privkey_t signer,
+gnutls_privkey_sign_data (gnutls_privkey_t signer,
gnutls_digest_algorithm_t hash,
unsigned int flags,
const gnutls_datum_t * data,
@@ -460,7 +462,7 @@ cleanup:
}
/**
- * gnutls_privkey_sign_hash2:
+ * gnutls_privkey_sign_hash:
* @signer: Holds the signer's key
* @hash_algo: The hash algorithm used
* @flags: zero for now
@@ -477,13 +479,15 @@ cleanup:
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
+ *
+ * Since: 2.12.0
**/
int
-gnutls_privkey_sign_hash2 (gnutls_privkey_t signer,
- gnutls_digest_algorithm_t hash_algo,
- unsigned int flags,
- const gnutls_datum_t * hash_data,
- gnutls_datum_t * signature)
+gnutls_privkey_sign_hash (gnutls_privkey_t signer,
+ gnutls_digest_algorithm_t hash_algo,
+ unsigned int flags,
+ const gnutls_datum_t * hash_data,
+ gnutls_datum_t * signature)
{
int ret;
gnutls_datum_t digest;
@@ -600,4 +604,3 @@ gnutls_privkey_decrypt_data (gnutls_privkey_t key,
return GNUTLS_E_INVALID_REQUEST;
}
}
-
diff --git a/lib/gnutls_pubkey.c b/lib/gnutls_pubkey.c
index d691559..b4deb73 100644
--- a/lib/gnutls_pubkey.c
+++ b/lib/gnutls_pubkey.c
@@ -214,6 +214,8 @@ gnutls_pubkey_import_x509 (gnutls_pubkey_t key,
gnutls_x509_crt_t crt,
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
+ *
+ * Since: 2.12.0
**/
int
gnutls_pubkey_import_privkey (gnutls_pubkey_t key, gnutls_privkey_t pkey,
@@ -998,13 +1000,16 @@ gnutls_pubkey_import_dsa_raw (gnutls_pubkey_t key,
* This function will verify the given signed data, using the
* parameters from the certificate.
*
- * Returns: In case of a verification failure %GNUTLS_E_PK_SIG_VERIFY_FAILED
- * is returned, and a positive code on success.
+ * Returns: In case of a verification failure
+ * %GNUTLS_E_PK_SIG_VERIFY_FAILED is returned, and a positive code
+ * on success.
+ *
+ * Since: 2.12.0
**/
int
gnutls_pubkey_verify_data (gnutls_pubkey_t pubkey, unsigned int flags,
- const gnutls_datum_t * data,
- const gnutls_datum_t * signature)
+ const gnutls_datum_t * data,
+ const gnutls_datum_t * signature)
{
int ret;
diff --git a/lib/gnutls_sig.c b/lib/gnutls_sig.c
index fe42ebc..70d6742 100644
--- a/lib/gnutls_sig.c
+++ b/lib/gnutls_sig.c
@@ -274,7 +274,7 @@ sign_tls_hash (gnutls_session_t session,
gnutls_digest_algorithm_t hash_algo,
if (!_gnutls_version_has_selectable_sighash (ver))
return _gnutls_privkey_sign_hash (pkey, hash_concat, signature);
else
- return gnutls_privkey_sign_hash2 (pkey, hash_algo, 0, hash_concat,
signature);
+ return gnutls_privkey_sign_hash (pkey, hash_algo, 0, hash_concat,
signature);
}
static int
diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index b4c1b30..6791b82 100644
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -108,18 +108,17 @@ int gnutls_privkey_import_openpgp (gnutls_privkey_t pkey,
gnutls_openpgp_privkey_t key,
unsigned int flags);
-int gnutls_privkey_sign_data2 (gnutls_privkey_t signer,
+int gnutls_privkey_sign_data (gnutls_privkey_t signer,
gnutls_digest_algorithm_t hash,
unsigned int flags,
const gnutls_datum_t * data,
gnutls_datum_t * signature);
-int
-gnutls_privkey_sign_hash2 (gnutls_privkey_t signer,
- gnutls_digest_algorithm_t hash_algo,
- unsigned int flags,
- const gnutls_datum_t * hash_data,
- gnutls_datum_t * signature);
+int gnutls_privkey_sign_hash (gnutls_privkey_t signer,
+ gnutls_digest_algorithm_t hash_algo,
+ unsigned int flags,
+ const gnutls_datum_t * hash_data,
+ gnutls_datum_t * signature);
int gnutls_privkey_decrypt_data (gnutls_privkey_t signer,
unsigned int flags,
diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index bc8431d..5b778c0 100644
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -7,7 +7,7 @@
#define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 +
__GNUC_PATCHLEVEL__)
-#if !defined(GNUTLS_INTERNAL_BUILD)
+#if !defined GNUTLS_INTERNAL_BUILD
#if _GNUTLS_GCC_VERSION >= 30100
#define _GNUTLS_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
#endif
@@ -178,7 +178,7 @@ gnutls_sign_callback_get (gnutls_session_t session, void
**userdata)
_GNUTLS_GCC_ATTR_DEPRECATED;
/* This is a very dangerous and error-prone function.
- * Use gnutls_privkey_sign_hash2() instead.
+ * Use gnutls_privkey_sign_hash() instead.
*/
int gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
const gnutls_datum_t * hash,
@@ -200,7 +200,7 @@ gnutls_sign_callback_get (gnutls_session_t session, void
**userdata)
const gnutls_datum_t * signature)
_GNUTLS_GCC_ATTR_DEPRECATED;
-/* we support the gnutls_privkey_sign_data2() instead.
+/* we support the gnutls_privkey_sign_data() instead.
*/
int gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
gnutls_digest_algorithm_t digest,
@@ -238,11 +238,6 @@ gnutls_sign_callback_get (gnutls_session_t session, void
**userdata)
unsigned int *mand)
_GNUTLS_GCC_ATTR_DEPRECATED;
- int gnutls_x509_crq_get_preferred_hash_algorithm (gnutls_x509_crq_t crq,
- gnutls_digest_algorithm_t * hash,
- unsigned int *mand)
- _GNUTLS_GCC_ATTR_DEPRECATED;
-
/* gnutls_x509_crq_privkey_sign() */
int gnutls_x509_crq_sign2 (gnutls_x509_crq_t crq,
gnutls_x509_privkey_t key,
diff --git a/lib/includes/gnutls/x509.h b/lib/includes/gnutls/x509.h
index 4d88382..810764b 100644
--- a/lib/includes/gnutls/x509.h
+++ b/lib/includes/gnutls/x509.h
@@ -871,4 +871,3 @@ extern "C"
#endif
#endif /* GNUTLS_X509_H */
-
diff --git a/lib/libgnutls.map b/lib/libgnutls.map
index 978a2a5..8312144 100644
--- a/lib/libgnutls.map
+++ b/lib/libgnutls.map
@@ -1,5 +1,5 @@
# libgnutls.map -- libgnutls linker version script. -*- ld-script -*-
-# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+# Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
# Foundation, Inc.
#
# Author: Simon Josefsson
@@ -621,8 +621,6 @@ GNUTLS_2_12
gnutls_pkcs11_privkey_get_pk_algorithm;
gnutls_pkcs11_privkey_get_info;
gnutls_pkcs11_privkey_import_url;
- gnutls_pkcs11_privkey_sign_data;
- gnutls_pkcs11_privkey_decrypt_data;
gnutls_pkcs11_obj_export;
gnutls_pkcs11_type_get_name;
gnutls_privkey_init;
@@ -670,7 +668,6 @@ GNUTLS_2_12
gnutls_sec_param_get_name;
gnutls_pk_bits_to_sec_param;
gnutls_rnd;
- gnutls_x509_crq_get_preferred_hash_algorithm;
gnutls_cipher_encrypt2;
gnutls_cipher_decrypt2;
gnutls_openpgp_privkey_sec_param;
@@ -680,8 +677,8 @@ GNUTLS_2_12
gnutls_pkcs11_token_init;
gnutls_pkcs11_token_set_pin;
gnutls_pkcs11_token_get_mechanism;
- gnutls_privkey_sign_hash2;
- gnutls_privkey_sign_data2;
+ gnutls_privkey_sign_hash;
+ gnutls_privkey_sign_data;
gnutls_openpgp_crt_verify_hash;
gnutls_pubkey_import_privkey;
gnutls_pubkey_verify_data;
diff --git a/lib/openpgp/pgp.c b/lib/openpgp/pgp.c
index ada1fe1..35f0fcc 100644
--- a/lib/openpgp/pgp.c
+++ b/lib/openpgp/pgp.c
@@ -1687,4 +1687,3 @@ gnutls_openpgp_crt_get_auth_subkey (gnutls_openpgp_crt_t
crt,
else
return GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE;
}
-
diff --git a/lib/openpgp/privkey.c b/lib/openpgp/privkey.c
index 6f2a396..07bb988 100644
--- a/lib/openpgp/privkey.c
+++ b/lib/openpgp/privkey.c
@@ -1225,7 +1225,7 @@ gnutls_openpgp_privkey_set_preferred_key_id
(gnutls_openpgp_privkey_t key,
return 0;
}
-/*-
+/**
* gnutls_openpgp_privkey_sign_hash:
* @key: Holds the key
* @hash: holds the data to be signed
@@ -1237,7 +1237,9 @@ gnutls_openpgp_privkey_set_preferred_key_id
(gnutls_openpgp_privkey_t key,
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
- -*/
+ *
+ * Deprecated: Use gnutls_privkey_sign_hash() instead.
+ */
int
gnutls_openpgp_privkey_sign_hash (gnutls_openpgp_privkey_t key,
const gnutls_datum_t * hash,
diff --git a/lib/x509/crl.c b/lib/x509/crl.c
index fca657f..501dce4 100644
--- a/lib/x509/crl.c
+++ b/lib/x509/crl.c
@@ -534,18 +534,20 @@ gnutls_x509_crl_get_crt_serial (gnutls_x509_crl_t crl,
int indx,
}
/**
- * gnutls_x509_crl_get_raw_issuer_dn - This function returns the issuer's DN
DER encoded
+ * gnutls_x509_crl_get_raw_issuer_dn:
* @crl: should contain a gnutls_x509_crl_t structure
* @dn: will hold the starting point of the DN
*
- * This function will return a pointer to the DER encoded DN structure and
- * the length.
+ * This function will return a pointer to the DER encoded DN structure
+ * and the length.
*
* Returns a negative value on error, and zero on success.
+ *
+ * Since: 2.12.0
**/
int
gnutls_x509_crl_get_raw_issuer_dn (gnutls_x509_crl_t crl,
- gnutls_datum_t * dn)
+ gnutls_datum_t * dn)
{
ASN1_TYPE c2 = ASN1_TYPE_EMPTY;
int result, len1;
diff --git a/lib/x509/crl_write.c b/lib/x509/crl_write.c
index 03c2e57..92fd0eb 100644
--- a/lib/x509/crl_write.c
+++ b/lib/x509/crl_write.c
@@ -92,10 +92,10 @@ gnutls_x509_crl_set_version (gnutls_x509_crl_t crl,
unsigned int version)
* This must be the last step in a certificate CRL since all
* the previously set parameters are now signed.
*
- * Deprecated: Use gnutls_x509_crl_privkey_sign() instead.
- *
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
+ *
+ * Deprecated: Use gnutls_x509_crl_privkey_sign() instead.
**/
int
gnutls_x509_crl_sign2 (gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer,
@@ -140,7 +140,7 @@ fail:
return result;
}
-/*-
+/**
* gnutls_x509_crl_sign:
* @crl: should contain a gnutls_x509_crl_t structure
* @issuer: is the certificate of the certificate issuer
@@ -151,7 +151,9 @@ fail:
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
- -*/
+ *
+ * Deprecated: Use gnutls_x509_crl_privkey_sign().
+ */
int
gnutls_x509_crl_sign (gnutls_x509_crl_t crl, gnutls_x509_crt_t issuer,
gnutls_x509_privkey_t issuer_key)
diff --git a/lib/x509/crq.c b/lib/x509/crq.c
index e96facb..02dc2c4 100644
--- a/lib/x509/crq.c
+++ b/lib/x509/crq.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010 Free Software
+ * Copyright (C) 2003, 2004, 2005, 2008, 2009, 2010, 2011 Free Software
* Foundation, Inc.
*
* Author: Nikos Mavrogiannopoulos
@@ -999,17 +999,12 @@ gnutls_x509_crq_set_challenge_password (gnutls_x509_crq_t
crq,
* This must be the last step in a certificate request generation
* since all the previously set parameters are now signed.
*
- * Use gnutls_x509_crq_get_preferred_hash_algorithm() to obtain
- * the digest algorithm to use with the specified public key
- * algorithm.
- *
- * Deprecated: Use gnutls_x509_crq_privkey_sign() instead.
- *
* Returns: %GNUTLS_E_SUCCESS on success, otherwise an error.
* %GNUTLS_E_ASN1_VALUE_NOT_FOUND is returned if you didn't set all
* information in the certificate request (e.g., the version using
* gnutls_x509_crq_set_version()).
*
+ * Deprecated: Use gnutls_x509_crq_privkey_sign() instead.
**/
int
gnutls_x509_crq_sign2 (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key,
@@ -1053,7 +1048,7 @@ fail:
return result;
}
-/*-
+/**
* gnutls_x509_crq_sign:
* @crq: should contain a #gnutls_x509_crq_t structure
* @key: holds a private key
@@ -1063,20 +1058,13 @@ fail:
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
- -*/
+ *
+ * Deprecated: Use gnutls_x509_crq_privkey_sign() instead.
+ */
int
gnutls_x509_crq_sign (gnutls_x509_crq_t crq, gnutls_x509_privkey_t key)
{
- gnutls_digest_algorithm_t dig;
- int ret = gnutls_x509_crq_get_preferred_hash_algorithm (crq, &dig, NULL);
-
- if (ret < 0)
- {
- gnutls_assert ();
- return ret;
- }
-
- return gnutls_x509_crq_sign2 (crq, key, dig, 0);
+ return gnutls_x509_crq_sign2 (crq, key, GNUTLS_DIG_SHA1, 0);
}
/**
@@ -2279,59 +2267,6 @@ gnutls_x509_crq_set_key_purpose_oid (gnutls_x509_crq_t
crq,
return 0;
}
-/**
- * gnutls_x509_crq_get_preferred_hash_algorithm:
- * @crq: Holds the certificate
- * @hash: The result of the call with the hash algorithm used for signature
- * @mand: If non zero it means that the algorithm MUST use this hash. May be
NULL.
- *
- * This function will read the certifcate and return the appropriate digest
- * algorithm to use for signing with this certificate. Some certificates (i.e.
- * DSA might not be able to sign without the preferred algorithm).
- *
- * Returns: the 0 if the hash algorithm is found. A negative value is
- * returned on error.
- *
- * Since: 2.11.0
- **/
-int
-gnutls_x509_crq_get_preferred_hash_algorithm (gnutls_x509_crq_t crq,
- gnutls_digest_algorithm_t *
- hash, unsigned int *mand)
-{
- bigint_t params[MAX_PUBLIC_PARAMS_SIZE];
- int params_size;
- int ret, i;
-
- if (crq == NULL)
- {
- gnutls_assert ();
- return GNUTLS_E_INVALID_REQUEST;
- }
-
- params_size = MAX_PUBLIC_PARAMS_SIZE;
- ret = _gnutls_x509_crq_get_mpis (crq, params, ¶ms_size);
- if (ret < 0)
- {
- gnutls_assert ();
- return ret;
- }
-
- ret =
- _gnutls_pk_get_hash_algorithm (gnutls_x509_crq_get_pk_algorithm
- (crq, NULL), params, params_size, hash,
- mand);
-
- /* release allocated mpis */
- for (i = 0; i < params_size; i++)
- {
- _gnutls_mpi_release (¶ms[i]);
- }
-
- return ret;
-}
-
-
static int
rsadsa_crq_get_key_id (gnutls_x509_crq_t crq, int pk,
unsigned char *output_data, size_t * output_data_size)
@@ -2548,7 +2483,7 @@ gnutls_x509_crq_privkey_sign (gnutls_x509_crq_t crq,
gnutls_privkey_t key,
return result;
}
- result = gnutls_privkey_sign_data2 (key, dig, 0, &tbs, &signature);
+ result = gnutls_privkey_sign_data (key, dig, 0, &tbs, &signature);
gnutls_free (tbs.data);
if (result < 0)
diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index c322934..c039f01 100644
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -1718,8 +1718,8 @@ cleanup:
return ret;
}
-/*-
- * _gnutls_x509_privkey_sign_hash:
+/**
+ * gnutls_x509_privkey_sign_hash:
* @key: Holds the key
* @hash: holds the data to be signed
* @signature: will contain newly allocated signature
@@ -1732,8 +1732,8 @@ cleanup:
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
*
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated in: 2.12.0
+ */
int
gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
const gnutls_datum_t * hash,
@@ -1758,7 +1758,7 @@ gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
return 0;
}
-/*-
+/**
* gnutls_x509_privkey_sign_data:
* @key: Holds the key
* @digest: should be MD5 or SHA1
@@ -1782,7 +1782,9 @@ gnutls_x509_privkey_sign_hash (gnutls_x509_privkey_t key,
*
* Returns: On success, %GNUTLS_E_SUCCESS is returned, otherwise a
* negative error value.
- -*/
+ *
+ * Deprecated: Use gnutls_privkey_sign_data().
+ */
int
gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
gnutls_digest_algorithm_t digest,
@@ -1835,7 +1837,7 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
}
-/*-
+/**
* gnutls_x509_privkey_verify_data:
* @key: Holds the key
* @flags: should be 0 for now
@@ -1848,8 +1850,8 @@ gnutls_x509_privkey_sign_data (gnutls_x509_privkey_t key,
* Returns: In case of a verification failure %GNUTLS_E_PK_SIG_VERIFY_FAILED
* is returned, and a positive code on success.
*
- * Deprecated in: 2.11.0
- -*/
+ * Deprecated: Use gnutls_pubkey_verify_data().
+ */
int
gnutls_x509_privkey_verify_data (gnutls_x509_privkey_t key,
unsigned int flags,
diff --git a/lib/x509/sign.c b/lib/x509/sign.c
index 6897b35..7860855 100644
--- a/lib/x509/sign.c
+++ b/lib/x509/sign.c
@@ -138,7 +138,7 @@ _gnutls_x509_pkix_sign (ASN1_TYPE src, const char *src_name,
return result;
}
- result = gnutls_privkey_sign_data2 (issuer_key, dig, 0, &tbs, &signature);
+ result = gnutls_privkey_sign_data (issuer_key, dig, 0, &tbs, &signature);
gnutls_free (tbs.data);
if (result < 0)
diff --git a/tests/x509sign-verify.c b/tests/x509sign-verify.c
index 7791117..cecff55 100644
--- a/tests/x509sign-verify.c
+++ b/tests/x509sign-verify.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
+ * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
* Foundation, Inc.
*
* Author: Nikos Mavrogiannopoulos, Simon Josefsson
@@ -181,15 +181,13 @@ doit (void)
if (ret < 0)
fail ("gnutls_privkey_import_x509\n");
- ret =
- gnutls_privkey_sign_hash2 (privkey, GNUTLS_DIG_SHA1, 0, &hash_data,
- &signature2);
+ ret = gnutls_privkey_sign_hash (privkey, GNUTLS_DIG_SHA1, 0,
+ &hash_data, &signature2);
if (ret < 0)
fail ("gnutls_privkey_sign_hash\n");
- ret =
- gnutls_privkey_sign_data2 (privkey, GNUTLS_DIG_SHA1, 0, &raw_data,
- &signature);
+ ret = gnutls_privkey_sign_data (privkey, GNUTLS_DIG_SHA1, 0,
+ &raw_data, &signature);
if (ret < 0)
fail ("gnutls_x509_privkey_sign_hash\n");
hooks/post-receive
--
GNU gnutls
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [SCM] GNU gnutls branch, master, updated. gnutls_2_11_6-243-g751a075,
Nikos Mavrogiannopoulos <=