2828#include "arc-types.h"
2929#include "arc-util.h"
3030
31+ /* libidn2 */
32+ #include <idn2.h>
33+
3134/* libbsd if found */
3235#ifdef USE_BSD_H
3336#include <bsd/string.h>
@@ -85,7 +88,7 @@ arc_get_key_dns(ARC_MESSAGE *msg, char *buf, size_t buflen)
8588 unsigned char * cp ;
8689 unsigned char * eom ;
8790 char * eob ;
88- unsigned char qname [ARC_MAXHOSTNAMELEN + 1 ];
91+ char qname [ARC_MAXHOSTNAMELEN + 1 ];
8992 unsigned char ansbuf [MAXPACKET ];
9093 struct timeval timeout ;
9194 HEADER hdr ;
@@ -96,14 +99,32 @@ arc_get_key_dns(ARC_MESSAGE *msg, char *buf, size_t buflen)
9699
97100 lib = msg -> arc_library ;
98101
99- n = snprintf (( char * ) qname , sizeof qname - 1 , "%s.%s.%s" ,
100- msg -> arc_selector , ARC_DNSKEYNAME , msg -> arc_domain );
102+ n = snprintf (qname , sizeof qname - 1 , "%s.%s.%s" , msg -> arc_selector ,
103+ ARC_DNSKEYNAME , msg -> arc_domain );
101104 if (n == -1 || n > sizeof qname - 1 )
102105 {
103106 arc_error (msg , "key query name too large" );
104107 return ARC_STAT_NORESOURCE ;
105108 }
106109
110+ char * qname_idn ;
111+ status = idn2_to_ascii_8z (qname , & qname_idn ,
112+ IDN2_NONTRANSITIONAL | IDN2_NFC_INPUT );
113+ if (status != IDN2_OK )
114+ {
115+ arc_error (msg , "failed to translate %s to ASCII: %s" , qname ,
116+ idn2_strerror (status ));
117+ return ARC_STAT_KEYFAIL ;
118+ }
119+
120+ if (strlcpy (qname , qname_idn , sizeof qname ) >= sizeof qname )
121+ {
122+ arc_error (msg , "key query name too large" );
123+ idn2_free (qname_idn );
124+ return ARC_STAT_NORESOURCE ;
125+ }
126+ idn2_free (qname_idn );
127+
107128 anslen = sizeof ansbuf ;
108129
109130 timeout .tv_sec = msg -> arc_timeout ;
@@ -116,8 +137,8 @@ arc_get_key_dns(ARC_MESSAGE *msg, char *buf, size_t buflen)
116137 return ARC_STAT_KEYFAIL ;
117138 }
118139
119- status = lib -> arcl_dns_start (lib -> arcl_dns_service , T_TXT , qname , ansbuf ,
120- anslen , & q );
140+ status = lib -> arcl_dns_start (lib -> arcl_dns_service , T_TXT ,
141+ ( unsigned char * ) qname , ansbuf , anslen , & q );
121142
122143 if (status != 0 )
123144 {
@@ -199,7 +220,7 @@ arc_get_key_dns(ARC_MESSAGE *msg, char *buf, size_t buflen)
199220 for (qdcount = ntohs ((unsigned short ) hdr .qdcount ); qdcount > 0 ; qdcount -- )
200221 {
201222 /* copy it first */
202- (void ) dn_expand ((unsigned char * ) & ansbuf , eom , cp , ( char * ) qname ,
223+ (void ) dn_expand ((unsigned char * ) & ansbuf , eom , cp , qname ,
203224 sizeof qname );
204225
205226 if ((n = dn_skipname (cp , eom )) < 0 )
@@ -408,8 +429,17 @@ arc_get_key_file(ARC_MESSAGE *msg, char *buf, size_t buflen)
408429 return ARC_STAT_NORESOURCE ;
409430 }
410431
432+ char * idn_name ;
433+ if (idn2_to_ascii_8z (name , & idn_name ,
434+ IDN2_NONTRANSITIONAL | IDN2_NFC_INPUT ) != IDN2_OK )
435+ {
436+ arc_error (msg , "failed to translate %s to ASCII" , name );
437+ fclose (f );
438+ return ARC_STAT_KEYFAIL ;
439+ }
440+
411441 memset (buf , '\0' , buflen );
412- while (fgets (( char * ) buf , buflen , f ) != NULL )
442+ while (fgets (buf , buflen , f ) != NULL )
413443 {
414444 if (buf [0 ] == '#' )
415445 {
@@ -436,14 +466,16 @@ arc_get_key_file(ARC_MESSAGE *msg, char *buf, size_t buflen)
436466 }
437467 }
438468
439- if (strcasecmp (( char * ) name , ( char * ) buf ) == 0 && p2 != NULL )
469+ if (strcasecmp (idn_name , buf ) == 0 && p2 != NULL )
440470 {
441471 memmove (buf , p2 , strlen (p2 ) + 1 );
472+ idn2_free (idn_name );
442473 fclose (f );
443474 return ARC_STAT_OK ;
444475 }
445476 }
446477
478+ idn2_free (idn_name );
447479 fclose (f );
448480
449481 return ARC_STAT_NOKEY ;
0 commit comments