From owner-p4-projects@FreeBSD.ORG  Tue Mar  4 14:36:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0C33B1065671; Tue,  4 Mar 2008 14:36:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id BFA4F1065670
	for <perforce@freebsd.org>; Tue,  4 Mar 2008 14:36:35 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id AEC018FC17
	for <perforce@freebsd.org>; Tue,  4 Mar 2008 14:36:35 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m24EaZPu008346
	for <perforce@freebsd.org>; Tue, 4 Mar 2008 14:36:35 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m24EaZdH008344
	for perforce@freebsd.org; Tue, 4 Mar 2008 14:36:35 GMT
	(envelope-from csjp@freebsd.org)
Date: Tue, 4 Mar 2008 14:36:35 GMT
Message-Id: <200803041436.m24EaZdH008344@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	csjp@freebsd.org using -f
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 136819 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 04 Mar 2008 14:36:36 -0000

http://perforce.freebsd.org/chv.cgi?CH=136819

Change 136819 by csjp@ibm01 on 2008/03/04 14:35:54

	Implement SSL for writes and reads

Affected files ...

.. //depot/projects/trustedbsd/netauditd/netauditd.c#14 edit

Differences ...

==== //depot/projects/trustedbsd/netauditd/netauditd.c#14 (text+ko) ====

@@ -291,6 +291,18 @@
 	}
 }
 
+int
+netaudit_write(struct au_cmpnt *au, u_char *buf, int len)
+{
+	int error;
+
+	if (crypto_enabled == 0)
+		return (write(au->ac_fd, buf, len));
+	error = SSL_write(au->ac_ssl, buf, len);
+	/* XXX error checking */
+	return (error);
+}
+
 void
 netaudit_oq(void)
 {
@@ -310,8 +322,7 @@
 			    au->ac_name);
 			r = q->aq_ptr;
 			s = r->ar_reclen - q->aq_remain;
-			ret = write(au->ac_fd, r->ar_rec + s,
-			    q->aq_remain);
+			ret = netaudit_write(au, r->ar_rec + s, q->aq_remain);
 			if (ret == -1) {
 				if (errno == EAGAIN)
 					break;
@@ -455,15 +466,22 @@
 	int ret, left;
 	u_int32_t hdr_remain, val, need;
 
-	ret = read(asb->sb_fd, asb->sb_buf, sizeof(asb->sb_buf));
-	if (ret == -1) {
-		if (errno != EINTR)
+	if (crypto_enabled == 0) {
+		ret = read(asb->sb_fd, asb->sb_buf, sizeof(asb->sb_buf));
+		if (ret == -1) {
+			if (errno != EINTR)
+				return (-1);
+			else
+				return (0);
+		} else if (ret == 0)
+			return (-1);
+	} else {
+		ret = SSL_read(asb->sb_ssl, asb->sb_buf,
+		    sizeof(asb->sb_buf));
+		if (ret < 0)
 			return (-1);
-		else
-			return (0);
+		/* XXX handle I/O errors */
 	}
-	else if (ret == 0)
-		return (-1);
 	left = ret;
 	bufptr = asb->sb_buf;
 	while (left > 0) {