[Redbutton-devel] SF.net SVN: redbutton: [438] redbutton-author/trunk/der_decode.c

[<ski...@us...>]

Revision: 438
          http://redbutton.svn.sourceforge.net/redbutton/?rev=438&view=rev
Author:   skilvington
Date:     2007-10-15 08:14:48 -0700 (Mon, 15 Oct 2007)

Log Message:
-----------
I wondered why I'd never written that hexdigit function before

Modified Paths:
--------------
    redbutton-author/trunk/der_decode.c

Modified: redbutton-author/trunk/der_decode.c
===================================================================
--- redbutton-author/trunk/der_decode.c	2007-10-15 08:52:29 UTC (rev 437)
+++ redbutton-author/trunk/der_decode.c	2007-10-15 15:14:48 UTC (rev 438)
@@ -10,7 +10,6 @@
 #include "der_decode.h"
 
 void verbose(char *, ...);
-char hexdigit(unsigned char);
 
 /* DER does not allow indefinite lengths */
 
@@ -119,15 +118,16 @@
 
 	verbose("<OctetString size=\"%d\">\n", length);
 
+	/* output a QPRINTABLE string */
 	fprintf(out, "'");
 	while(left > 0)
 	{
 		if(der_read_file(der, 1, &byte) < 0)
 			return der_error("OctetString");
 		if(byte != '\'' && byte >= 0x20 && byte < 0x7f)
-		fprintf(out, "%c", byte);
+			fprintf(out, "%c", byte);
 		else
-		fprintf(out, "=%c%c", hexdigit((byte >> 4) & 0xf), hexdigit(byte & 0xf));
+			fprintf(out, "=%02x", byte);
 		left --;
 	}
 	fprintf(out, "'");
@@ -163,17 +163,6 @@
 	return length;
 }
 
-char
-hexdigit(unsigned char nibble)
-{
-	if(nibble < 10)
-		return '0' + nibble;
-	else if(nibble < 16)
-		return 'a' + nibble;
-	else
-		return '?';
-}
-
 int
 get_der_int(FILE *der, int length)
 {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.