*** empty log message ***

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index e82cc3d5ad6dc253e5d5edd9888c670ced0aad0a..f439491deaea02813b9b9969abfd66f45f242efb 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -192,6 +192,12 @@ typedef enum ContentType { GNUTLS_CHANGE_CIPHER_SPEC=20, GNUTLS_ALERT,
 typedef enum GNUTLS_X509_CertificateFmt { GNUTLS_X509_FMT_DER, 
        GNUTLS_X509_FMT_PEM } GNUTLS_X509_CertificateFmt;
 
+typedef enum PKAlgorithm { GNUTLS_PK_RSA = 1, GNUTLS_PK_DSA,   /* sign only */
+       GNUTLS_PK_UNKNOWN 
+} PKAlgorithm;
+
+#define GNUTLS_PKAlgorithm PKAlgorithm
+
 /* STATE (stop) */
 
 

diff --git a/lib/gnutls_pk.h b/lib/gnutls_pk.h
index c53b461f2d8c5210bfb52d458e0d401014e291eb..a0ff23609511acbea329b4f57274413148037798 100644 (file)
--- a/lib/gnutls_pk.h
+++ b/lib/gnutls_pk.h
@@ -1,12 +1,6 @@
 #ifndef GNUTLS_PK_H
 # define GNUTLS_PK_H
 
-typedef enum PKAlgorithm { GNUTLS_PK_RSA = 1, GNUTLS_PK_DSA,   /* sign only */
-       GNUTLS_PK_UNKNOWN 
-} PKAlgorithm;
-
-#define GNUTLS_PKAlgorithm PKAlgorithm
-
 int _gnutls_pk_encrypt(int algo, MPI * resarr, MPI data, MPI * pkey);
 int _gnutls_pkcs1_rsa_encrypt(gnutls_datum * ciphertext, gnutls_datum plaintext,
                      MPI * params, int btype);

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 80212d93440924459841645d77dfbaba722ab297..c49532c5834af1655dcfe4d59ed7626bfd552f07 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -2236,7 +2236,7 @@ int gnutls_x509_pkcs7_extract_certificate(const gnutls_datum * pkcs7_struct, int
 /**
   * gnutls_x509_extract_certificate_pk_algorithm - This function returns the certificate's PublicKey algorithm
   * @cert: is a DER encoded X.509 certificate
-  * @bits: if bits is non-null it will have enough space to hold the
+  * @bits: if bits is non null it should have enough space to hold the
   * parameters size in bits.
   *
   * This function will return the public key algorithm of an X.509