From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Tue, 5 Feb 2002 12:18:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: gnutls_0_3_90~108
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6df823853c84b63fd73d098aeebf602c9772fec8;p=thirdparty%2Fgnutls.git

*** empty log message ***
---

diff --git a/lib/crypt_bcrypt.c b/lib/crypt_bcrypt.c
index aae20025fa..53d3202f3e 100644
--- a/lib/crypt_bcrypt.c
+++ b/lib/crypt_bcrypt.c
@@ -42,10 +42,6 @@
 #include "gnutls_errors.h"
 #include "debug.h"
 
-#define rotl(x,n)   (((x) << ((uint32)(n))) | ((x) >> (32 - (uint32)(n))))
-#define rotr(x,n)   (((x) >> ((uint32)(n))) | ((x) << (32 - (uint32)(n))))
-#define byteswap(x)	((rotl(x, 8) & 0x00ff00ff) | (rotr(x, 8) & 0xff00ff00))
-
 typedef struct {
 	uint32 S[4][256], P[18];
 } blf_ctx;
diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index d38517d3fe..21ee7e236e 100644
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -342,7 +342,7 @@ int _gnutls_openpgp_cert_verify_peers(GNUTLS_STATE state)
 	
 	/* Verify certificate 
 	 */
-	verify = gnutls_openpgp_verify_certificate( &info->raw_certificate_list[0],
+	verify = gnutls_openpgp_verify_key( &info->raw_certificate_list[0],
 				      peer_certificate_list_size);
 
 	if (verify < 0) {
diff --git a/lib/gnutls_num.c b/lib/gnutls_num.c
index b8f1193c60..5e2f572f29 100644
--- a/lib/gnutls_num.c
+++ b/lib/gnutls_num.c
@@ -22,13 +22,6 @@
 #include <gnutls_num.h>
 #include <gnutls_errors.h>
 
-#define rotl32(x,n)   (((x) << ((uint16)(n))) | ((x) >> (32 - (uint16)(n))))
-#define rotr32(x,n)   (((x) >> ((uint16)(n))) | ((x) << (32 - (uint16)(n))))
-#define rotl16(x,n)   (((x) << ((uint16)(n))) | ((x) >> (16 - (uint16)(n))))
-#define rotr16(x,n)   (((x) >> ((uint16)(n))) | ((x) << (16 - (uint16)(n))))
-
-#define byteswap16(x)  ((rotl16(x, 8) & 0x00ff) | (rotr16(x, 8) & 0xff00))
-#define byteswap32(x)  ((rotl32(x, 8) & 0x00ff00ffUL) | (rotr32(x, 8) & 0xff00ff00UL))
 
 #ifndef HAVE_UINT64
 
diff --git a/lib/gnutls_num.h b/lib/gnutls_num.h
index 0ce493be2a..b5d2d4e756 100644
--- a/lib/gnutls_num.h
+++ b/lib/gnutls_num.h
@@ -23,6 +23,14 @@
 #define GMIN(x,y) (x<y)?x:y
 #define GMAX(x,y) (x>y)?x:y
 
+#define rotl32(x,n)   (((x) << ((uint16)(n))) | ((x) >> (32 - (uint16)(n))))
+#define rotr32(x,n)   (((x) >> ((uint16)(n))) | ((x) << (32 - (uint16)(n))))
+#define rotl16(x,n)   (((x) << ((uint16)(n))) | ((x) >> (16 - (uint16)(n))))
+#define rotr16(x,n)   (((x) >> ((uint16)(n))) | ((x) << (16 - (uint16)(n))))
+
+#define byteswap16(x)  ((rotl16(x, 8) & 0x00ff) | (rotr16(x, 8) & 0xff00))
+#define byteswap32(x)  ((rotl32(x, 8) & 0x00ff00ffUL) | (rotr32(x, 8) & 0xff00ff00UL))
+
 uint32 uint24touint32( uint24 num);
 uint24 uint32touint24( uint32 num);
 uint32 READuint32( const opaque* data);
diff --git a/lib/x509_extensions.c b/lib/x509_extensions.c
index 68bf6aba65..a28000102b 100644
--- a/lib/x509_extensions.c
+++ b/lib/x509_extensions.c
@@ -31,7 +31,7 @@
 
 /* Here we only extract the KeyUsage field
  */
-static int _extract_keyUsage(char *keyUsage, opaque * extnValue,
+static int _extract_keyUsage(uint16 *keyUsage, opaque * extnValue,
 			     int extnValueLen)
 {
 	node_asn *ext;
diff --git a/src/common.c b/src/common.c
index 08a1a37400..6408cb8d71 100644
--- a/src/common.c
+++ b/src/common.c
@@ -86,8 +86,6 @@ void print_openpgp_info(GNUTLS_STATE state)
 
 	cert_list = gnutls_certificate_get_peers(state, &cert_list_size);
 
-
-
 	if (cert_list_size > 0)
 		if (gnutls_openpgp_fingerprint
 		    (&cert_list[0], digest, &digest_size) >= 0) {
@@ -97,17 +95,20 @@ void print_openpgp_info(GNUTLS_STATE state)
 					(unsigned char) digest[i]);
 				print += 3;
 			}
-			printf(" - Certificate fingerprint: %s\n",
+
+			printf(" - PGP Key version: %d\n", 
+				gnutls_openpgp_extract_key_version(&cert_list[0]));
+
+			printf(" - PGP Key fingerprint: %s\n",
 			       printable);
 
-			gnutls_openpgp_extract_certificate_dn(&cert_list
+			gnutls_openpgp_extract_key_name(&cert_list
 							      [0], &pgp_name);
 			PRINT_PGP_NAME(pgp_name);
 
 		}
 
 
-
 }
 
 void print_cert_vrfy(GNUTLS_STATE state)