summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-05-27 13:36:27 +0000
committerjsing <>2014-05-27 13:36:27 +0000
commitcdcecffd001724cf147934b1d4c84e7e2f4153bd (patch)
tree0d1e8e74a83d35ec22353ef829d87fcbfb270865 /src
parentba4ffb9afcda0e5d602804bb0bf6ac732e7d46b9 (diff)
downloadopenbsd-cdcecffd001724cf147934b1d4c84e7e2f4153bd.tar.gz
openbsd-cdcecffd001724cf147934b1d4c84e7e2f4153bd.tar.bz2
openbsd-cdcecffd001724cf147934b1d4c84e7e2f4153bd.zip
Remove MemCheck_{on,off} that escaped last time around.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl_ciph.c4
-rw-r--r--src/lib/libssl/ssl_ciph.c4
2 files changed, 0 insertions, 8 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index c9485f8194..8b4825f9d3 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1735,7 +1735,6 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1735 return 0; 1735 return 0;
1736 } 1736 }
1737 1737
1738 MemCheck_off();
1739 comp = malloc(sizeof(SSL_COMP)); 1738 comp = malloc(sizeof(SSL_COMP));
1740 if (comp == NULL) { 1739 if (comp == NULL) {
1741 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1740 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
@@ -1747,17 +1746,14 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1747 if (ssl_comp_methods && 1746 if (ssl_comp_methods &&
1748 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) { 1747 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) {
1749 free(comp); 1748 free(comp);
1750 MemCheck_on();
1751 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID); 1749 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID);
1752 return (1); 1750 return (1);
1753 } else if ((ssl_comp_methods == NULL) || 1751 } else if ((ssl_comp_methods == NULL) ||
1754 !sk_SSL_COMP_push(ssl_comp_methods, comp)) { 1752 !sk_SSL_COMP_push(ssl_comp_methods, comp)) {
1755 free(comp); 1753 free(comp);
1756 MemCheck_on();
1757 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1754 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
1758 return (1); 1755 return (1);
1759 } else { 1756 } else {
1760 MemCheck_on();
1761 return (0); 1757 return (0);
1762 } 1758 }
1763} 1759}
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index c9485f8194..8b4825f9d3 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1735,7 +1735,6 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1735 return 0; 1735 return 0;
1736 } 1736 }
1737 1737
1738 MemCheck_off();
1739 comp = malloc(sizeof(SSL_COMP)); 1738 comp = malloc(sizeof(SSL_COMP));
1740 if (comp == NULL) { 1739 if (comp == NULL) {
1741 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1740 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
@@ -1747,17 +1746,14 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1747 if (ssl_comp_methods && 1746 if (ssl_comp_methods &&
1748 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) { 1747 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) {
1749 free(comp); 1748 free(comp);
1750 MemCheck_on();
1751 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID); 1749 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID);
1752 return (1); 1750 return (1);
1753 } else if ((ssl_comp_methods == NULL) || 1751 } else if ((ssl_comp_methods == NULL) ||
1754 !sk_SSL_COMP_push(ssl_comp_methods, comp)) { 1752 !sk_SSL_COMP_push(ssl_comp_methods, comp)) {
1755 free(comp); 1753 free(comp);
1756 MemCheck_on();
1757 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1754 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE);
1758 return (1); 1755 return (1);
1759 } else { 1756 } else {
1760 MemCheck_on();
1761 return (0); 1757 return (0);
1762 } 1758 }
1763} 1759}