8 files changed, 4 insertions, 42 deletions

diff --git a/src/lib/libcrypto/asn1/asn1_par.c b/src/lib/libcrypto/asn1/asn1_par.c
index 8085d1e570..5480e75720 100644
--- a/src/lib/libcrypto/asn1/asn1_par.c
+++ b/src/lib/libcrypto/asn1/asn1_par.c
@@ -138,9 +138,7 @@ asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offset,
         while ((p < tot) && (op < p)) {
                 op = p;
                 j = ASN1_get_object(&p, &len, &tag, &xclass, length);
-#ifdef LINT
-                j = j;
-#endif
+
                 if (j & 0x80) {
                         if (BIO_write(bp, "Error in encoding\n", 18) <= 0)
                                 goto end;
diff --git a/src/lib/libcrypto/asn1/asn_mime.c b/src/lib/libcrypto/asn1/asn_mime.c
index 6ea47dacf8..5d70b76f05 100644
--- a/src/lib/libcrypto/asn1/asn_mime.c
+++ b/src/lib/libcrypto/asn1/asn_mime.c
@@ -999,7 +999,7 @@ strip_eol(char *linebuf, int *plen)
         int len = *plen;
         char *p, c;
         int is_eol = 0;
-        p = linebuf + len - 1;
+
         for (p = linebuf + len - 1; len > 0; len--, p--) {
                 c = *p;
                 if (c == '\n')
diff --git a/src/lib/libssl/src/crypto/asn1/asn1_par.c b/src/lib/libssl/src/crypto/asn1/asn1_par.c
index 8085d1e570..5480e75720 100644
--- a/src/lib/libssl/src/crypto/asn1/asn1_par.c
+++ b/src/lib/libssl/src/crypto/asn1/asn1_par.c
@@ -138,9 +138,7 @@ asn1_parse2(BIO *bp, const unsigned char **pp, long length, int offset,
         while ((p < tot) && (op < p)) {
                 op = p;
                 j = ASN1_get_object(&p, &len, &tag, &xclass, length);
-#ifdef LINT
-                j = j;
-#endif
+
                 if (j & 0x80) {
                         if (BIO_write(bp, "Error in encoding\n", 18) <= 0)
                                 goto end;
diff --git a/src/lib/libssl/src/crypto/asn1/asn_mime.c b/src/lib/libssl/src/crypto/asn1/asn_mime.c
index 6ea47dacf8..5d70b76f05 100644
--- a/src/lib/libssl/src/crypto/asn1/asn_mime.c
+++ b/src/lib/libssl/src/crypto/asn1/asn_mime.c
@@ -999,7 +999,7 @@ strip_eol(char *linebuf, int *plen)
         int len = *plen;
         char *p, c;
         int is_eol = 0;
-        p = linebuf + len - 1;
+
         for (p = linebuf + len - 1; len > 0; len--, p--) {
                 c = *p;
                 if (c == '\n')
diff --git a/src/lib/libssl/src/ssl/ssl_lib.c b/src/lib/libssl/src/ssl/ssl_lib.c
index deef714be1..e607060d42 100644
--- a/src/lib/libssl/src/ssl/ssl_lib.c
+++ b/src/lib/libssl/src/ssl/ssl_lib.c
@@ -1765,10 +1765,6 @@ SSL_CTX_new(const SSL_METHOD *meth)
         ret->references = 1;
         ret->quiet_shutdown = 0;
 
-/*      ret->cipher=NULL;
-        ret->master_key=NULL;
-*/
-
         ret->info_callback = NULL;
 
         ret->app_verify_callback = 0;
diff --git a/src/lib/libssl/src/ssl/ssl_locl.h b/src/lib/libssl/src/ssl/ssl_locl.h
index 06f37b69e6..206bd94fc5 100644
--- a/src/lib/libssl/src/ssl/ssl_locl.h
+++ b/src/lib/libssl/src/ssl/ssl_locl.h
@@ -515,18 +515,9 @@ typedef struct sess_cert_st {
 } SESS_CERT;
 
 
-/*#define MAC_DEBUG     */
-
-/*#define ERR_DEBUG     */
-/*#define ABORT_DEBUG   */
-/*#define PKT_DEBUG 1   */
-/*#define DES_DEBUG     */
-/*#define DES_OFB_DEBUG */
 /*#define SSL_DEBUG     */
 /*#define RSA_DEBUG     */ 
-/*#define IDEA_DEBUG    */ 
 
-#define FP_ICC  (int (*)(const void *,const void *))
 #define ssl_put_cipher_by_char(ssl,ciph,ptr) \
                 ((ssl)->method->put_cipher_by_char((ciph),(ptr)))
 #define ssl_get_cipher_by_char(ssl,ptr) \
@@ -896,8 +887,4 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out,
     size_t data_plus_mac_plus_padding_size, const unsigned char *mac_secret,
     unsigned mac_secret_length, char is_sslv3);
 
-void tls_fips_digest_extra(const EVP_CIPHER_CTX *cipher_ctx,
-    EVP_MD_CTX *mac_ctx, const unsigned char *data, size_t data_len,
-    size_t orig_len);
-
 #endif
diff --git a/src/lib/libssl/ssl_lib.c b/src/lib/libssl/ssl_lib.c
index deef714be1..e607060d42 100644
--- a/src/lib/libssl/ssl_lib.c
+++ b/src/lib/libssl/ssl_lib.c
@@ -1765,10 +1765,6 @@ SSL_CTX_new(const SSL_METHOD *meth)
         ret->references = 1;
         ret->quiet_shutdown = 0;
 
-/*      ret->cipher=NULL;
-        ret->master_key=NULL;
-*/
-
         ret->info_callback = NULL;
 
         ret->app_verify_callback = 0;
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 06f37b69e6..206bd94fc5 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -515,18 +515,9 @@ typedef struct sess_cert_st {
 } SESS_CERT;
 
 
-/*#define MAC_DEBUG     */
-
-/*#define ERR_DEBUG     */
-/*#define ABORT_DEBUG   */
-/*#define PKT_DEBUG 1   */
-/*#define DES_DEBUG     */
-/*#define DES_OFB_DEBUG */
 /*#define SSL_DEBUG     */
 /*#define RSA_DEBUG     */ 
-/*#define IDEA_DEBUG    */ 
 
-#define FP_ICC  (int (*)(const void *,const void *))
 #define ssl_put_cipher_by_char(ssl,ciph,ptr) \
                 ((ssl)->method->put_cipher_by_char((ciph),(ptr)))
 #define ssl_get_cipher_by_char(ssl,ptr) \
@@ -896,8 +887,4 @@ void ssl3_cbc_digest_record(const EVP_MD_CTX *ctx, unsigned char *md_out,
     size_t data_plus_mac_plus_padding_size, const unsigned char *mac_secret,
     unsigned mac_secret_length, char is_sslv3);
 
-void tls_fips_digest_extra(const EVP_CIPHER_CTX *cipher_ctx,
-    EVP_MD_CTX *mac_ctx, const unsigned char *data, size_t data_len,
-    size_t orig_len);
-
 #endif