summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjsing <>2014-05-27 13:44:06 +0000
committerjsing <>2014-05-27 13:44:06 +0000
commitd4a590efc9b941652f50685df40769f10139f187 (patch)
treef099326ea9d93910b5532a6ad6a3078b493b7f91 /src
parentcdcecffd001724cf147934b1d4c84e7e2f4153bd (diff)
downloadopenbsd-d4a590efc9b941652f50685df40769f10139f187.tar.gz
openbsd-d4a590efc9b941652f50685df40769f10139f187.tar.bz2
openbsd-d4a590efc9b941652f50685df40769f10139f187.zip
Wrap some long lines.
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/ssl/ssl_ciph.c12
-rw-r--r--src/lib/libssl/ssl_ciph.c12
2 files changed, 16 insertions, 8 deletions
diff --git a/src/lib/libssl/src/ssl/ssl_ciph.c b/src/lib/libssl/src/ssl/ssl_ciph.c
index 8b4825f9d3..64248d8e91 100644
--- a/src/lib/libssl/src/ssl/ssl_ciph.c
+++ b/src/lib/libssl/src/ssl/ssl_ciph.c
@@ -1731,13 +1731,15 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1731 64 to 192: external party methods assigned by IANA 1731 64 to 192: external party methods assigned by IANA
1732 193 to 255: reserved for private use */ 1732 193 to 255: reserved for private use */
1733 if (id < 193 || id > 255) { 1733 if (id < 193 || id > 255) {
1734 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE); 1734 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1735 SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE);
1735 return 0; 1736 return 0;
1736 } 1737 }
1737 1738
1738 comp = malloc(sizeof(SSL_COMP)); 1739 comp = malloc(sizeof(SSL_COMP));
1739 if (comp == NULL) { 1740 if (comp == NULL) {
1740 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1741 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1742 ERR_R_MALLOC_FAILURE);
1741 return (1); 1743 return (1);
1742 } 1744 }
1743 comp->id = id; 1745 comp->id = id;
@@ -1746,12 +1748,14 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1746 if (ssl_comp_methods && 1748 if (ssl_comp_methods &&
1747 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) { 1749 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) {
1748 free(comp); 1750 free(comp);
1749 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID); 1751 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1752 SSL_R_DUPLICATE_COMPRESSION_ID);
1750 return (1); 1753 return (1);
1751 } else if ((ssl_comp_methods == NULL) || 1754 } else if ((ssl_comp_methods == NULL) ||
1752 !sk_SSL_COMP_push(ssl_comp_methods, comp)) { 1755 !sk_SSL_COMP_push(ssl_comp_methods, comp)) {
1753 free(comp); 1756 free(comp);
1754 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1757 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1758 ERR_R_MALLOC_FAILURE);
1755 return (1); 1759 return (1);
1756 } else { 1760 } else {
1757 return (0); 1761 return (0);
diff --git a/src/lib/libssl/ssl_ciph.c b/src/lib/libssl/ssl_ciph.c
index 8b4825f9d3..64248d8e91 100644
--- a/src/lib/libssl/ssl_ciph.c
+++ b/src/lib/libssl/ssl_ciph.c
@@ -1731,13 +1731,15 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1731 64 to 192: external party methods assigned by IANA 1731 64 to 192: external party methods assigned by IANA
1732 193 to 255: reserved for private use */ 1732 193 to 255: reserved for private use */
1733 if (id < 193 || id > 255) { 1733 if (id < 193 || id > 255) {
1734 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE); 1734 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1735 SSL_R_COMPRESSION_ID_NOT_WITHIN_PRIVATE_RANGE);
1735 return 0; 1736 return 0;
1736 } 1737 }
1737 1738
1738 comp = malloc(sizeof(SSL_COMP)); 1739 comp = malloc(sizeof(SSL_COMP));
1739 if (comp == NULL) { 1740 if (comp == NULL) {
1740 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1741 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1742 ERR_R_MALLOC_FAILURE);
1741 return (1); 1743 return (1);
1742 } 1744 }
1743 comp->id = id; 1745 comp->id = id;
@@ -1746,12 +1748,14 @@ SSL_COMP_add_compression_method(int id, COMP_METHOD *cm)
1746 if (ssl_comp_methods && 1748 if (ssl_comp_methods &&
1747 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) { 1749 sk_SSL_COMP_find(ssl_comp_methods, comp) >= 0) {
1748 free(comp); 1750 free(comp);
1749 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, SSL_R_DUPLICATE_COMPRESSION_ID); 1751 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1752 SSL_R_DUPLICATE_COMPRESSION_ID);
1750 return (1); 1753 return (1);
1751 } else if ((ssl_comp_methods == NULL) || 1754 } else if ((ssl_comp_methods == NULL) ||
1752 !sk_SSL_COMP_push(ssl_comp_methods, comp)) { 1755 !sk_SSL_COMP_push(ssl_comp_methods, comp)) {
1753 free(comp); 1756 free(comp);
1754 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD, ERR_R_MALLOC_FAILURE); 1757 SSLerr(SSL_F_SSL_COMP_ADD_COMPRESSION_METHOD,
1758 ERR_R_MALLOC_FAILURE);
1755 return (1); 1759 return (1);
1756 } else { 1760 } else {
1757 return (0); 1761 return (0);