commit e99801b603dea8893dcc61c70b327ef2d00b652c
author Kenny Root <kroot@google.com> Fri Nov 06 15:31:15 2015 -0800
committer Kenny Root <kroot@google.com> Fri Nov 06 15:31:15 2015 -0800
tree 37655d933cb72bcd7553af526581d3e24e051d7d
parent 8cd47e1f90ee6c1dbedb462b252c8e1e7b079e38

Revert "Revert "external/boringssl: sync with upstream.""

This reverts commit 03bcf618b7ed811b305845461fbb5497dfe55ac3.

No changes here. trusty build was fixed with the required rules.mk changes.

src/crypto/bio/fd.c

diff --git a/src/crypto/bio/fd.c b/src/crypto/bio/fd.c
index 0b5baca..0b3484c 100644
--- a/src/crypto/bio/fd.c
+++ b/src/crypto/bio/fd.c
@@ -208,9 +208,9 @@
         if (ip != NULL) {
           *ip = b->num;
         }
-        return 1;
+        return b->num;
       } else {
-        ret = 0;
+        ret = -1;
       }
       break;
     case BIO_CTRL_GET_CLOSE: