removed CERT_CORRUPTED

diff --git a/doc/tex/ex3.tex b/doc/tex/ex3.tex
index 9243c8fcadff7659188573dca729bed53c32a50a..513f6d95d5edccd05dbd965813fdda6bd4302dd2 100644 (file)
--- a/doc/tex/ex3.tex
+++ b/doc/tex/ex3.tex
@@ -55,9 +55,6 @@ int print_info(GNUTLS_STATE state)
       case GNUTLS_CERT_NONE:
          printf("- Peer did not send any X509 Certificate.\n");
          break;
-      case GNUTLS_CERT_CORRUPTED:
-         printf("- Peer's certificate was corrupt\n");
-         break;
       case GNUTLS_CERT_REVOKED:
          printf("- Peer's certificate was revoked\n");
          break;

diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index 2d3c1bc1796fc9e2dc2c7656b3b7efb754900e8c..ceff03b2223cef27a8f5fe895556fe704303cd85 100644 (file)
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -62,8 +62,7 @@ typedef enum GNUTLS_AlertDescription { GNUTLS_A_CLOSE_NOTIFY, GNUTLS_A_UNEXPECTE
  */
 typedef enum GNUTLS_CertificateStatus { GNUTLS_CERT_TRUSTED=1, 
        GNUTLS_CERT_VALID, GNUTLS_CERT_INVALID, GNUTLS_CERT_EXPIRED, 
-       GNUTLS_CERT_REVOKED, GNUTLS_CERT_CORRUPTED,
-       GNUTLS_CERT_NONE 
+       GNUTLS_CERT_REVOKED, GNUTLS_CERT_NONE 
 } GNUTLS_CertificateStatus;
 
 typedef enum GNUTLS_CertificateRequest { GNUTLS_CERT_IGNORE, GNUTLS_CERT_REQUEST=1, GNUTLS_CERT_REQUIRE } GNUTLS_CertificateRequest;

diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c
index b69965edc8130cab71006781f685d8c8cc3e9b97..393b231b3c9028a962334d31189b561cf53d7ee8 100644 (file)
--- a/lib/gnutls_cert.c
+++ b/lib/gnutls_cert.c
@@ -349,7 +349,7 @@ int _gnutls_openpgp_cert_verify_peers(GNUTLS_STATE state)
 
        if (verify < 0) {
                gnutls_assert();
-               return GNUTLS_CERT_CORRUPTED;
+               return GNUTLS_CERT_INVALID;
        }
 
 
@@ -377,7 +377,6 @@ int _gnutls_openpgp_cert_verify_peers(GNUTLS_STATE state)
   * GNUTLS_CERT_REVOKED: the certificate has been revoked
   *  (not implemented yet).
   * GNUTLS_CERT_EXPIRED: the certificate has expired.
-  * GNUTLS_CERT_CORRUPTED: the certificate is corrupted.
   *
   * A negative error code is returned in case of an error.
   *

diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 09ee8353a4dcda976714385eefa7aa0ddc5e5384..4a36bb21e6f418afd27f984e7d51cff2a0937665 100644 (file)
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -121,8 +121,7 @@ typedef enum AlertDescription { GNUTLS_A_CLOSE_NOTIFY, GNUTLS_A_UNEXPECTED_MESSA
 
 typedef enum CertificateStatus { GNUTLS_CERT_TRUSTED=1, 
        GNUTLS_CERT_VALID, GNUTLS_CERT_INVALID, GNUTLS_CERT_EXPIRED, 
-       GNUTLS_CERT_REVOKED, GNUTLS_CERT_CORRUPTED,
-       GNUTLS_CERT_NONE 
+       GNUTLS_CERT_REVOKED, GNUTLS_CERT_NONE 
 } CertificateStatus;
 #define GNUTLS_CertificateStatus CertificateStatus
 

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 1b7b45f6bf3b007b5773878ea2c1f159af4664d2..6cb3634220d22238e3b7c6cfe52659879eccac90 100644 (file)
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -762,7 +762,7 @@ int _gnutls_x509_cert_verify_peers(GNUTLS_STATE state)
 
        if (verify < 0) {
                gnutls_assert();
-               return GNUTLS_CERT_CORRUPTED;
+               return GNUTLS_CERT_INVALID;
        }
 
 
@@ -861,7 +861,7 @@ int gnutls_x509_verify_certificate( const gnutls_datum* cert_list, int cert_list
 
        if (verify < 0) {
                gnutls_assert();
-               return GNUTLS_CERT_CORRUPTED;
+               return GNUTLS_CERT_INVALID;
        }
 
        return verify;

diff --git a/lib/x509_sig_check.c b/lib/x509_sig_check.c
index f5af5bb0b42061337895a2978b950ad0bd421731..188a01d950d2f00774c24eaf94f5cb7e65968e2f 100644 (file)
--- a/lib/x509_sig_check.c
+++ b/lib/x509_sig_check.c
@@ -195,7 +195,7 @@ gnutls_datum tbs;
        tbs = _gnutls_get_tbs( cert);
        if (tbs.data==NULL) {
                gnutls_assert();
-               return GNUTLS_CERT_CORRUPTED;
+               return GNUTLS_CERT_INVALID;
        }
 
        _gnutls_x509_log("X509_VERIFY: CERT[%s]\n", GET_CN(cert->raw));
@@ -232,7 +232,7 @@ gnutls_datum tbs;
        _gnutls_x509_log( "X509_SIG: PK: %d\n", issuer->subject_pk_algorithm);  
 
        gnutls_assert();
-       return GNUTLS_CERT_CORRUPTED;
+       return GNUTLS_CERT_INVALID;
 }
 
 

diff --git a/src/common.c b/src/common.c
index d391c86f3d98f593e6963015ba62f146089037f5..03ec39e6d6a9d0e1ab7664d650320713b99727b3 100644 (file)
--- a/src/common.c
+++ b/src/common.c
@@ -133,9 +133,6 @@ void print_cert_vrfy(GNUTLS_STATE state)
        case GNUTLS_CERT_NONE:
                printf("- Peer did not send any certificate.\n");
                break;
-       case GNUTLS_CERT_CORRUPTED:
-               printf("- Peer's certificate was corrupted.\n");
-               break;
        default:
                printf("- Invalid status of peer's certificate.\n");
                break;