summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2002-03-26 12:42:38 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2002-03-26 12:42:38 +0000
commit3df4b5e02fef796bd978de4d54cea3b6ba7c5afd (patch)
tree8afbdfda3673275406e9d0d643e78fa3aecbe0d2
parent48d55e1cc85fd074f3179c6d38cd579255984bdb (diff)
downloadgnutls-3df4b5e02fef796bd978de4d54cea3b6ba7c5afd.tar.gz
*** empty log message ***
-rw-r--r--lib/gnutls_int.h6
-rw-r--r--lib/gnutls_pk.h6
-rw-r--r--lib/gnutls_x509.c2
3 files changed, 7 insertions, 7 deletions
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index e82cc3d5ad..f439491dea 100644
--- 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 c53b461f2d..a0ff236095 100644
--- 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 80212d9344..c49532c583 100644
--- 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