This diff boils down to: removing unused shit.
src/ssl/ssl_locl.h:
- FP_ICC isn't used anylonger.
- The fips function was removed.
- Those defines aren't used anylonger.
src/ssl/ssl_lib.c:
- That bit of code has been disabled since 1998 (and perhaps before, there is
no archive). And the data structure has changed.
asn_mime.c:
- That appears superfluous to me.
asn1_par.c
- It took me a while to figure out why this was written in the first place.
Perhaps at some point in time j was unused? Obviously it is superfluous now.
Index: src/ssl/ssl_locl.h
===================================================================
RCS file: /backup/mirrors/cvsync/src/lib/libssl/src/ssl/ssl_locl.h,v
retrieving revision 1.37
diff -u -p -u -r1.37 ssl_locl.h
--- src/ssl/ssl_locl.h 24 May 2014 12:44:48 -0000 1.37
+++ src/ssl/ssl_locl.h 25 May 2014 10:49:11 -0000
@@ -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) \
@@ -895,9 +886,5 @@ void ssl3_cbc_digest_record(const EVP_MD
const unsigned char *data, size_t data_plus_mac_size,
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
Index: src/ssl/ssl_lib.c
===================================================================
RCS file: /backup/mirrors/cvsync/src/lib/libssl/src/ssl/ssl_lib.c,v
retrieving revision 1.46
diff -u -p -u -r1.46 ssl_lib.c
--- src/ssl/ssl_lib.c 24 May 2014 18:34:03 -0000 1.46
+++ src/ssl/ssl_lib.c 25 May 2014 10:49:11 -0000
@@ -1771,10 +1771,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;
Index: src/crypto/asn1/asn_mime.c
===================================================================
RCS file: /backup/mirrors/cvsync/src/lib/libssl/src/crypto/asn1/asn_mime.c,v
retrieving revision 1.14
diff -u -p -u -r1.14 asn_mime.c
--- src/crypto/asn1/asn_mime.c 15 May 2014 21:07:10 -0000 1.14
+++ src/crypto/asn1/asn_mime.c 25 May 2014 10:49:11 -0000
@@ -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')
Index: src/crypto/asn1/asn1_par.c
===================================================================
RCS file: /backup/mirrors/cvsync/src/lib/libssl/src/crypto/asn1/asn1_par.c,v
retrieving revision 1.16
diff -u -p -u -r1.16 asn1_par.c
--- src/crypto/asn1/asn1_par.c 19 Apr 2014 11:43:07 -0000 1.16
+++ src/crypto/asn1/asn1_par.c 25 May 2014 10:49:11 -0000
@@ -138,9 +138,7 @@ asn1_parse2(BIO *bp, const unsigned char
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;
