diff options
author | cvs2hg <devnull@localhost> | 2000-10-07 00:56:34 +0000 |
---|---|---|
committer | cvs2hg <devnull@localhost> | 2000-10-07 00:56:34 +0000 |
commit | a0d72609ebf9f64f616902b8d980a89522180be2 (patch) | |
tree | 417c1e6660b237b38f0f8a41d1824a73db7e154d | |
parent | 6351eecfe075db4a87f25e1a83dd417ec840bb1b (diff) | |
download | nss-hg-Netscape_20001030_RELEASE.tar.gz |
fixup commit for tag 'Netscape_20001030_RELEASE'Netscape_20001030_RELEASE
25 files changed, 733 insertions, 1618 deletions
diff --git a/security/nss/cmd/modutil/Makefile b/security/nss/cmd/modutil/Makefile index 3d2bbb412..5f4321fec 100644 --- a/security/nss/cmd/modutil/Makefile +++ b/security/nss/cmd/modutil/Makefile @@ -72,9 +72,14 @@ include $(CORE_DEPTH)/coreconf/rules.mk include ../platrules.mk -# -# Cancel the built-in implicit yacc and lex rules. -# - -%.c: %.y -%.c: %.l +ifeq ($(OS_ARCH), WINNT) +installparse.c: installparse.y + yacc -d installparse.y + mv ytab.c installparse.c + mv ytab.h installparse.h +else +installparse.c: installparse.y + yacc -d installparse.y + mv y.tab.c installparse.c + mv y.tab.h installparse.h +endif diff --git a/security/nss/cmd/modutil/installparse.c b/security/nss/cmd/modutil/installparse.c index 16f81b6eb..5afa19ba6 100644 --- a/security/nss/cmd/modutil/installparse.c +++ b/security/nss/cmd/modutil/installparse.c @@ -1,7 +1,5 @@ -#ifndef lint -char yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90"; -#endif -#line 37 "installparse.y" + +# line 37 "installparse.y" #define yyparse Pk11Install_yyparse #define yylex Pk11Install_yylex @@ -36,141 +34,61 @@ char yysccsid[] = "@(#)yaccpar 1.4 (Berkeley) 02/25/90"; extern char *Pk11Install_yytext; char *Pk11Install_yyerrstr=NULL; -#line 40 "ytab.c" -#define OPENBRACE 257 -#define CLOSEBRACE 258 -#define STRING 259 -#define YYERRCODE 256 -short yylhs[] = { -1, - 0, 1, 1, 2, 2, 3, 4, -}; -short yylen[] = { 2, - 1, 2, 0, 1, 1, 4, 1, -}; -short yydefred[] = { 0, - 0, 0, 1, 0, 4, 0, 2, 0, 0, 6, -}; -short yydgoto[] = { 2, - 3, 4, 5, 6, -}; -short yysindex[] = { -257, - 0, 0, 0, -257, 0, -252, 0, -257, -251, 0, -}; -short yyrindex[] = { 6, - 1, 0, 0, 3, 0, 0, 0, -250, 0, 0, -}; -short yygindex[] = { 0, - -4, 0, 0, 0, -}; -#define YYTABLESIZE 261 -short yytable[] = { 7, - 5, 1, 3, 9, 8, 3, 10, 3, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 7, 5, 5, - 3, -}; -short yycheck[] = { 4, - 0, 259, 0, 8, 257, 0, 258, 258, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, - -1, -1, -1, -1, -1, -1, -1, 257, 258, 259, - 258, -}; -#define YYFINAL 2 -#ifndef YYDEBUG -#define YYDEBUG 0 -#endif -#define YYMAXTOKEN 259 -#if YYDEBUG -char *yyname[] = { -"end-of-file",0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, -0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"OPENBRACE","CLOSEBRACE","STRING", -}; -char *yyrule[] = { -"$accept : toplist", -"toplist : valuelist", -"valuelist : value valuelist", -"valuelist :", -"value : key_value_pair", -"value : STRING", -"key_value_pair : key OPENBRACE valuelist CLOSEBRACE", -"key : STRING", -}; +# define OPENBRACE 257 +# define CLOSEBRACE 258 +# define STRING 259 + +#ifdef __STDC__ +#include <stdlib.h> +#include <string.h> +#else +#include <malloc.h> +#include <memory.h> #endif -#ifndef YYSTYPE -typedef int YYSTYPE; + +#include <values.h> + +#ifdef __cplusplus + +#ifndef yyerror + void yyerror(const char *); #endif -#define yyclearin (yychar=(-1)) -#define yyerrok (yyerrflag=0) -#ifndef YYSTACKSIZE -#ifdef YYMAXDEPTH -#define YYSTACKSIZE YYMAXDEPTH + +#ifndef yylex +#ifdef __EXTERN_C__ + extern "C" { int yylex(void); } #else -#define YYSTACKSIZE 300 + int yylex(void); #endif #endif -int yydebug; -int yynerrs; -int yyerrflag; -int yychar; -short *yyssp; -YYSTYPE *yyvsp; -YYSTYPE yyval; + int yyparse(void); + +#endif +#define yyclearin yychar = -1 +#define yyerrok yyerrflag = 0 +extern int yychar; +extern int yyerrflag; +#ifndef YYSTYPE +#define YYSTYPE int +#endif YYSTYPE yylval; -#define yystacksize YYSTACKSIZE -short yyss[YYSTACKSIZE]; -YYSTYPE yyvs[YYSTACKSIZE]; -#line 118 "installparse.y" +YYSTYPE yyval; +typedef int yytabelem; +#ifndef YYMAXDEPTH +#define YYMAXDEPTH 150 +#endif +#if YYMAXDEPTH > 0 +int yy_yys[YYMAXDEPTH], *yys = yy_yys; +YYSTYPE yy_yyv[YYMAXDEPTH], *yyv = yy_yyv; +#else /* user does initial allocation */ +int *yys; +YYSTYPE *yyv; +#endif +static int yymaxdepth = YYMAXDEPTH; +# define YYERRCODE 256 + +# line 117 "installparse.y" + /*----------------------- Program Section --------------------------------*/ /*************************************************************************/ @@ -187,243 +105,641 @@ Pk11Install_yyerror(char *message) } Pk11Install_yyerrstr=tmp; } -#line 191 "ytab.c" -#define YYABORT goto yyabort -#define YYACCEPT goto yyaccept -#define YYERROR goto yyerrlab -int -yyparse() -{ - register int yym, yyn, yystate; +static const yytabelem yyexca[] ={ +-1, 1, + 0, -1, + -2, 0, +-1, 5, + 257, 7, + -2, 5, + }; +# define YYNPROD 8 +# define YYLAST 13 +static const yytabelem yyact[]={ + + 5, 10, 8, 2, 6, 4, 3, 7, 1, 0, + 0, 0, 9 }; +static const yytabelem yypact[]={ + + -259,-10000000,-10000000, -259,-10000000,-10000000, -255,-10000000, -259, -257, +-10000000 }; +static const yytabelem yypgo[]={ + + 0, 8, 3, 6, 5, 4 }; +static const yytabelem yyr1[]={ + + 0, 1, 2, 2, 3, 3, 4, 5 }; +static const yytabelem yyr2[]={ + + 0, 3, 5, 1, 3, 3, 9, 3 }; +static const yytabelem yychk[]={ + +-10000000, -1, -2, -3, -4, 259, -5, -2, 257, -2, + 258 }; +static const yytabelem yydef[]={ + + 3, -2, 1, 3, 4, -2, 0, 2, 3, 0, + 6 }; +typedef struct +#ifdef __cplusplus + yytoktype +#endif +{ char *t_name; int t_val; } yytoktype; +#ifndef YYDEBUG +# define YYDEBUG 0 /* don't allow debugging */ +#endif + #if YYDEBUG - register char *yys; - extern char *getenv(); - - if (yys = getenv("YYDEBUG")) - { - yyn = *yys; - if (yyn >= '0' && yyn <= '9') - yydebug = yyn - '0'; - } + +yytoktype yytoks[] = +{ + "OPENBRACE", 257, + "CLOSEBRACE", 258, + "STRING", 259, + "-unknown-", -1 /* ends search */ +}; + +char * yyreds[] = +{ + "-no such reduction-", + "toplist : valuelist", + "valuelist : value valuelist", + "valuelist : /* empty */", + "value : key_value_pair", + "value : STRING", + "key_value_pair : key OPENBRACE valuelist CLOSEBRACE", + "key : STRING", +}; +#endif /* YYDEBUG */ +# line 1 "/usr/ccs/bin/yaccpar" +/* + * Copyright (c) 1993 by Sun Microsystems, Inc. + */ + +#pragma ident "@(#)yaccpar 6.14 97/01/16 SMI" + +/* +** Skeleton parser driver for yacc output +*/ + +/* +** yacc user known macros and defines +*/ +#define YYERROR goto yyerrlab +#define YYACCEPT return(0) +#define YYABORT return(1) +#define YYBACKUP( newtoken, newvalue )\ +{\ + if ( yychar >= 0 || ( yyr2[ yytmp ] >> 1 ) != 1 )\ + {\ + yyerror( "syntax error - cannot backup" );\ + goto yyerrlab;\ + }\ + yychar = newtoken;\ + yystate = *yyps;\ + yylval = newvalue;\ + goto yynewstate;\ +} +#define YYRECOVERING() (!!yyerrflag) +#define YYNEW(type) malloc(sizeof(type) * yynewmax) +#define YYCOPY(to, from, type) \ + (type *) memcpy(to, (char *) from, yymaxdepth * sizeof (type)) +#define YYENLARGE( from, type) \ + (type *) realloc((char *) from, yynewmax * sizeof(type)) +#ifndef YYDEBUG +# define YYDEBUG 1 /* make debugging available */ #endif - yynerrs = 0; - yyerrflag = 0; - yychar = (-1); +/* +** user known globals +*/ +int yydebug; /* set to 1 to get debugging */ - yyssp = yyss; - yyvsp = yyvs; - *yyssp = yystate = 0; +/* +** driver internal defines +*/ +#define YYFLAG (-10000000) -yyloop: - if (yyn = yydefred[yystate]) goto yyreduce; - if (yychar < 0) - { - if ((yychar = yylex()) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - printf("yydebug: state %d, reading %d (%s)\n", yystate, - yychar, yys); - } +/* +** global variables used by the parser +*/ +YYSTYPE *yypv; /* top of value stack */ +int *yyps; /* top of state stack */ + +int yystate; /* current state */ +int yytmp; /* extra var (lasts between blocks) */ + +int yynerrs; /* number of errors */ +int yyerrflag; /* error recovery flag */ +int yychar; /* current input token number */ + + + +#ifdef YYNMBCHARS +#define YYLEX() yycvtok(yylex()) +/* +** yycvtok - return a token if i is a wchar_t value that exceeds 255. +** If i<255, i itself is the token. If i>255 but the neither +** of the 30th or 31st bit is on, i is already a token. +*/ +#if defined(__STDC__) || defined(__cplusplus) +int yycvtok(int i) +#else +int yycvtok(i) int i; #endif - } - if ((yyn = yysindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { -#if YYDEBUG - if (yydebug) - printf("yydebug: state %d, shifting to state %d\n", - yystate, yytable[yyn]); +{ + int first = 0; + int last = YYNMBCHARS - 1; + int mid; + wchar_t j; + + if(i&0x60000000){/*Must convert to a token. */ + if( yymbchars[last].character < i ){ + return i;/*Giving up*/ + } + while ((last>=first)&&(first>=0)) {/*Binary search loop*/ + mid = (first+last)/2; + j = yymbchars[mid].character; + if( j==i ){/*Found*/ + return yymbchars[mid].tvalue; + }else if( j<i ){ + first = mid + 1; + }else{ + last = mid -1; + } + } + /*No entry in the table.*/ + return i;/* Giving up.*/ + }else{/* i is already a token. */ + return i; + } +} +#else/*!YYNMBCHARS*/ +#define YYLEX() yylex() +#endif/*!YYNMBCHARS*/ + +/* +** yyparse - return 0 if worked, 1 if syntax error not recovered from +*/ +#if defined(__STDC__) || defined(__cplusplus) +int yyparse(void) +#else +int yyparse() #endif - if (yyssp >= yyss + yystacksize - 1) - { - goto yyoverflow; - } - *++yyssp = yystate = yytable[yyn]; - *++yyvsp = yylval; - yychar = (-1); - if (yyerrflag > 0) --yyerrflag; - goto yyloop; - } - if ((yyn = yyrindex[yystate]) && (yyn += yychar) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yychar) - { - yyn = yytable[yyn]; - goto yyreduce; - } - if (yyerrflag) goto yyinrecovery; -#ifdef lint - goto yynewerror; +{ + register YYSTYPE *yypvt = 0; /* top of value stack for $vars */ + +#if defined(__cplusplus) || defined(lint) +/* + hacks to please C++ and lint - goto's inside + switch should never be executed +*/ + static int __yaccpar_lint_hack__ = 0; + switch (__yaccpar_lint_hack__) + { + case 1: goto yyerrlab; + case 2: goto yynewstate; + } #endif -yynewerror: - yyerror("syntax error"); -#ifdef lint - goto yyerrlab; + + /* + ** Initialize externals - yyparse may be called more than once + */ + yypv = &yyv[-1]; + yyps = &yys[-1]; + yystate = 0; + yytmp = 0; + yynerrs = 0; + yyerrflag = 0; + yychar = -1; + +#if YYMAXDEPTH <= 0 + if (yymaxdepth <= 0) + { + if ((yymaxdepth = YYEXPAND(0)) <= 0) + { + yyerror("yacc initialization error"); + YYABORT; + } + } #endif -yyerrlab: - ++yynerrs; -yyinrecovery: - if (yyerrflag < 3) - { - yyerrflag = 3; - for (;;) - { - if ((yyn = yysindex[*yyssp]) && (yyn += YYERRCODE) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == YYERRCODE) - { + + { + register YYSTYPE *yy_pv; /* top of value stack */ + register int *yy_ps; /* top of state stack */ + register int yy_state; /* current state */ + register int yy_n; /* internal state number info */ + goto yystack; /* moved from 6 lines above to here to please C++ */ + + /* + ** get globals into registers. + ** branch to here only if YYBACKUP was called. + */ + yynewstate: + yy_pv = yypv; + yy_ps = yyps; + yy_state = yystate; + goto yy_newstate; + + /* + ** get globals into registers. + ** either we just started, or we just finished a reduction + */ + yystack: + yy_pv = yypv; + yy_ps = yyps; + yy_state = yystate; + + /* + ** top of for (;;) loop while no reductions done + */ + yy_stack: + /* + ** put a state and value onto the stacks + */ #if YYDEBUG - if (yydebug) - printf("yydebug: state %d, error recovery shifting\ - to state %d\n", *yyssp, yytable[yyn]); + /* + ** if debugging, look up token value in list of value vs. + ** name pairs. 0 and negative (-1) are special values. + ** Note: linear search is used since time is not a real + ** consideration while debugging. + */ + if ( yydebug ) + { + register int yy_i; + + printf( "State %d, token ", yy_state ); + if ( yychar == 0 ) + printf( "end-of-file\n" ); + else if ( yychar < 0 ) + printf( "-none-\n" ); + else + { + for ( yy_i = 0; yytoks[yy_i].t_val >= 0; + yy_i++ ) + { + if ( yytoks[yy_i].t_val == yychar ) + break; + } + printf( "%s\n", yytoks[yy_i].t_name ); + } + } +#endif /* YYDEBUG */ + if ( ++yy_ps >= &yys[ yymaxdepth ] ) /* room on stack? */ + { + /* + ** reallocate and recover. Note that pointers + ** have to be reset, or bad things will happen + */ + int yyps_index = (yy_ps - yys); + int yypv_index = (yy_pv - yyv); + int yypvt_index = (yypvt - yyv); + int yynewmax; +#ifdef YYEXPAND + yynewmax = YYEXPAND(yymaxdepth); +#else + yynewmax = 2 * yymaxdepth; /* double table size */ + if (yymaxdepth == YYMAXDEPTH) /* first time growth */ + { + char *newyys = (char *)YYNEW(int); + char *newyyv = (char *)YYNEW(YYSTYPE); + if (newyys != 0 && newyyv != 0) + { + yys = YYCOPY(newyys, yys, int); + yyv = YYCOPY(newyyv, yyv, YYSTYPE); + } + else + yynewmax = 0; /* failed */ + } + else /* not first time */ + { + yys = YYENLARGE(yys, int); + yyv = YYENLARGE(yyv, YYSTYPE); + if (yys == 0 || yyv == 0) + yynewmax = 0; /* failed */ + } #endif - if (yyssp >= yyss + yystacksize - 1) - { - goto yyoverflow; - } - *++yyssp = yystate = yytable[yyn]; - *++yyvsp = yylval; - goto yyloop; - } - else - { + if (yynewmax <= yymaxdepth) /* tables not expanded */ + { + yyerror( "yacc stack overflow" ); + YYABORT; + } + yymaxdepth = yynewmax; + + yy_ps = yys + yyps_index; + yy_pv = yyv + yypv_index; + yypvt = yyv + yypvt_index; + } + *yy_ps = yy_state; + *++yy_pv = yyval; + + /* + ** we have a new state - find out what to do + */ + yy_newstate: + if ( ( yy_n = yypact[ yy_state ] ) <= YYFLAG ) + goto yydefault; /* simple state */ #if YYDEBUG - if (yydebug) - printf("yydebug: error recovery discarding state %d\n", - *yyssp); + /* + ** if debugging, need to mark whether new token grabbed + */ + yytmp = yychar < 0; #endif - if (yyssp <= yyss) goto yyabort; - --yyssp; - --yyvsp; - } - } - } - else - { - if (yychar == 0) goto yyabort; + if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) ) + yychar = 0; /* reached EOF */ +#if YYDEBUG + if ( yydebug && yytmp ) + { + register int yy_i; + + printf( "Received token " ); + if ( yychar == 0 ) + printf( "end-of-file\n" ); + else if ( yychar < 0 ) + printf( "-none-\n" ); + else + { + for ( yy_i = 0; yytoks[yy_i].t_val >= 0; + yy_i++ ) + { + if ( yytoks[yy_i].t_val == yychar ) + break; + } + printf( "%s\n", yytoks[yy_i].t_name ); + } + } +#endif /* YYDEBUG */ + if ( ( ( yy_n += yychar ) < 0 ) || ( yy_n >= YYLAST ) ) + goto yydefault; + if ( yychk[ yy_n = yyact[ yy_n ] ] == yychar ) /*valid shift*/ + { + yychar = -1; + yyval = yylval; + yy_state = yy_n; + if ( yyerrflag > 0 ) + yyerrflag--; + goto yy_stack; + } + + yydefault: + if ( ( yy_n = yydef[ yy_state ] ) == -2 ) + { +#if YYDEBUG + yytmp = yychar < 0; +#endif + if ( ( yychar < 0 ) && ( ( yychar = YYLEX() ) < 0 ) ) + yychar = 0; /* reached EOF */ +#if YYDEBUG + if ( yydebug && yytmp ) + { + register int yy_i; + + printf( "Received token " ); + if ( yychar == 0 ) + printf( "end-of-file\n" ); + else if ( yychar < 0 ) + printf( "-none-\n" ); + else + { + for ( yy_i = 0; + yytoks[yy_i].t_val >= 0; + yy_i++ ) + { + if ( yytoks[yy_i].t_val + == yychar ) + { + break; + } + } + printf( "%s\n", yytoks[yy_i].t_name ); + } + } +#endif /* YYDEBUG */ + /* + ** look through exception table + */ + { + register const int *yyxi = yyexca; + + while ( ( *yyxi != -1 ) || + ( yyxi[1] != yy_state ) ) + { + yyxi += 2; + } + while ( ( *(yyxi += 2) >= 0 ) && + ( *yyxi != yychar ) ) + ; + if ( ( yy_n = yyxi[1] ) < 0 ) + YYACCEPT; + } + } + + /* + ** check for syntax error + */ + if ( yy_n == 0 ) /* have an error */ + { + /* no worry about speed here! */ + switch ( yyerrflag ) + { + case 0: /* new error */ + yyerror( "syntax error" ); + goto skip_init; + yyerrlab: + /* + ** get globals into registers. + ** we have a user generated syntax type error + */ + yy_pv = yypv; + yy_ps = yyps; + yy_state = yystate; + skip_init: + yynerrs++; + /* FALLTHRU */ + case 1: + case 2: /* incompletely recovered error */ + /* try again... */ + yyerrflag = 3; + /* + ** find state where "error" is a legal + ** shift action + */ + while ( yy_ps >= yys ) + { + yy_n = yypact[ *yy_ps ] + YYERRCODE; + if ( yy_n >= 0 && yy_n < YYLAST && + yychk[yyact[yy_n]] == YYERRCODE) { + /* + ** simulate shift of "error" + */ + yy_state = yyact[ yy_n ]; + goto yy_stack; + } + /* + ** current state has no shift on + ** "error", pop stack + */ #if YYDEBUG - if (yydebug) - { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - printf("yydebug: state %d, error recovery discards token %d (%s)\n", - yystate, yychar, yys); - } +# define _POP_ "Error recovery pops state %d, uncovers state %d\n" + if ( yydebug ) + printf( _POP_, *yy_ps, + yy_ps[-1] ); +# undef _POP_ #endif - yychar = (-1); - goto yyloop; - } -yyreduce: + yy_ps--; + yy_pv--; + } + /* + ** there is no state on stack with "error" as + ** a valid shift. give up. + */ + YYABORT; + case 3: /* no shift yet; eat a token */ #if YYDEBUG - if (yydebug) - printf("yydebug: state %d, reducing by rule %d (%s)\n", - yystate, yyn, yyrule[yyn]); + /* + ** if debugging, look up token in list of + ** pairs. 0 and negative shouldn't occur, + ** but since timing doesn't matter when + ** debugging, it doesn't hurt to leave the + ** tests here. + */ + if ( yydebug ) + { + register int yy_i; + + printf( "Error recovery discards " ); + if ( yychar == 0 ) + printf( "token end-of-file\n" ); + else if ( yychar < 0 ) + printf( "token -none-\n" ); + else + { + for ( yy_i = 0; + yytoks[yy_i].t_val >= 0; + yy_i++ ) + { + if ( yytoks[yy_i].t_val + == yychar ) + { + break; + } + } + printf( "token %s\n", + yytoks[yy_i].t_name ); + } + } +#endif /* YYDEBUG */ + if ( yychar == 0 ) /* reached EOF. quit */ + YYABORT; + yychar = -1; + goto yy_newstate; + } + }/* end if ( yy_n == 0 ) */ + /* + ** reduction by production yy_n + ** put stack tops, etc. so things right after switch + */ +#if YYDEBUG + /* + ** if debugging, print the string that is the user's + ** specification of the reduction which is just about + ** to be done. + */ + if ( yydebug ) + printf( "Reduce by (%d) \"%s\"\n", + yy_n, yyreds[ yy_n ] ); #endif - yym = yylen[yyn]; - yyval = yyvsp[1-yym]; - switch (yyn) - { + yytmp = yy_n; /* value to switch over */ + yypvt = yy_pv; /* $vars top of value stack */ + /* + ** Look in goto table for next state + ** Sorry about using yy_state here as temporary + ** register variable, but why not, if it works... + ** If yyr2[ yy_n ] doesn't have the low order bit + ** set, then there is no action to be done for + ** this reduction. So, no saving & unsaving of + ** registers done. The only difference between the + ** code just after the if and the body of the if is + ** the goto yy_stack in the body. This way the test + ** can be made before the choice of what to do is needed. + */ + { + /* length of production doubled with extra bit */ + register int yy_len = yyr2[ yy_n ]; + + if ( !( yy_len & 01 ) ) + { + yy_len >>= 1; + yyval = ( yy_pv -= yy_len )[1]; /* $$ = $1 */ + yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] + + *( yy_ps -= yy_len ) + 1; + if ( yy_state >= YYLAST || + yychk[ yy_state = + yyact[ yy_state ] ] != -yy_n ) + { + yy_state = yyact[ yypgo[ yy_n ] ]; + } + goto yy_stack; + } + yy_len >>= 1; + yyval = ( yy_pv -= yy_len )[1]; /* $$ = $1 */ + yy_state = yypgo[ yy_n = yyr1[ yy_n ] ] + + *( yy_ps -= yy_len ) + 1; + if ( yy_state >= YYLAST || + yychk[ yy_state = yyact[ yy_state ] ] != -yy_n ) + { + yy_state = yyact[ yypgo[ yy_n ] ]; + } + } + /* save until reenter driver code */ + yystate = yy_state; + yyps = yy_ps; + yypv = yy_pv; + } + /* + ** code supplied by user is placed in this switch + */ + switch( yytmp ) + { + case 1: -#line 84 "installparse.y" +# line 84 "installparse.y" { - Pk11Install_valueList = yyvsp[0].list; -} -break; + Pk11Install_valueList = yypvt[-0].list; +} break; case 2: -#line 89 "installparse.y" +# line 89 "installparse.y" { - Pk11Install_ValueList_AddItem(yyvsp[0].list,yyvsp[-1].value); - yyval .list = yyvsp[0].list; -} -break; + Pk11Install_ValueList_AddItem(yypvt[-0].list,yypvt[-1].value); + yyval.list = yypvt[-0].list; +} break; case 3: -#line 94 "installparse.y" +# line 94 "installparse.y" { - yyval .list = Pk11Install_ValueList_new(); -} -break; + yyval.list = Pk11Install_ValueList_new(); +} break; case 4: -#line 99 "installparse.y" +# line 99 "installparse.y" { - yyval .value= Pk11Install_Value_new(PAIR_VALUE,yyvsp[0]); -} -break; + yyval.value= Pk11Install_Value_new(PAIR_VALUE,yypvt[-0]); +} break; case 5: -#line 103 "installparse.y" +# line 103 "installparse.y" { - yyval .value= Pk11Install_Value_new(STRING_VALUE, yyvsp[0]); -} -break; + yyval.value= Pk11Install_Value_new(STRING_VALUE, yypvt[-0]); +} break; case 6: -#line 108 "installparse.y" +# line 108 "installparse.y" { - yyval .pair = Pk11Install_Pair_new(yyvsp[-3].string,yyvsp[-1].list); -} -break; + yyval.pair = Pk11Install_Pair_new(yypvt[-3].string,yypvt[-1].list); +} break; case 7: -#line 113 "installparse.y" +# line 113 "installparse.y" { - yyval .string = yyvsp[0].string; -} -break; -#line 374 "ytab.c" - } - yyssp -= yym; - yystate = *yyssp; - yyvsp -= yym; - yym = yylhs[yyn]; - if (yystate == 0 && yym == 0) - { -#ifdef YYDEBUG - if (yydebug) - printf("yydebug: after reduction, shifting from state 0 to\ - state %d\n", YYFINAL); -#endif - yystate = YYFINAL; - *++yyssp = YYFINAL; - *++yyvsp = yyval; - if (yychar < 0) - { - if ((yychar = yylex()) < 0) yychar = 0; -#if YYDEBUG - if (yydebug) - { - yys = 0; - if (yychar <= YYMAXTOKEN) yys = yyname[yychar]; - if (!yys) yys = "illegal-symbol"; - printf("yydebug: state %d, reading %d (%s)\n", - YYFINAL, yychar, yys); - } -#endif - } - if (yychar == 0) goto yyaccept; - goto yyloop; - } - if ((yyn = yygindex[yym]) && (yyn += yystate) >= 0 && - yyn <= YYTABLESIZE && yycheck[yyn] == yystate) - yystate = yytable[yyn]; - else - yystate = yydgoto[yym]; -#ifdef YYDEBUG - if (yydebug) - printf("yydebug: after reduction, shifting from state %d \ -to state %d\n", *yyssp, yystate); -#endif - if (yyssp >= yyss + yystacksize - 1) - { - goto yyoverflow; - } - *++yyssp = yystate; - *++yyvsp = yyval; - goto yyloop; -yyoverflow: - yyerror("yacc stack overflow"); -yyabort: - return (1); -yyaccept: - return (0); + yyval.string = yypvt[-0].string; +} break; +# line 531 "/usr/ccs/bin/yaccpar" + } + goto yystack; /* reset registers in driver code */ } + diff --git a/security/nss/cmd/modutil/installparse.h b/security/nss/cmd/modutil/installparse.h index 75686d4fd..f57ad8f55 100644 --- a/security/nss/cmd/modutil/installparse.h +++ b/security/nss/cmd/modutil/installparse.h @@ -1,3 +1,3 @@ -#define OPENBRACE 257 -#define CLOSEBRACE 258 -#define STRING 259 +# define OPENBRACE 257 +# define CLOSEBRACE 258 +# define STRING 259 diff --git a/security/nss/cmd/modutil/rules.mk b/security/nss/cmd/modutil/rules.mk index b34662513..c22175ffd 100644 --- a/security/nss/cmd/modutil/rules.mk +++ b/security/nss/cmd/modutil/rules.mk @@ -31,14 +31,6 @@ # GPL. # -# -# Some versions of yacc generate files that include platform-specific -# system headers. For example, the yacc in Solaris 2.6 inserts -# #include <values.h> -# which does not exist on NT. For portability, always use Berkeley -# yacc (such as the yacc in Linux) to generate files. -# - generate: installparse.c installparse.l installparse.c: diff --git a/security/nss/cmd/strsclnt/strsclnt.c b/security/nss/cmd/strsclnt/strsclnt.c index 932879f69..059a0696e 100644 --- a/security/nss/cmd/strsclnt/strsclnt.c +++ b/security/nss/cmd/strsclnt/strsclnt.c @@ -116,7 +116,7 @@ int ssl3CipherSuites[] = { * which ciphers to use. */ -const char *cipherString; +char *cipherString; int MakeCertOK; @@ -221,7 +221,7 @@ errWarn(char * funcString) PRErrorCode perr = PR_GetError(); const char * errString = SECU_Strerror(perr); - fprintf(stderr, "%s returned error %d:\n%s\n", + fprintf(stderr, "exit after %s with error %d:\n%s\n", funcString, perr, errString); } @@ -717,8 +717,8 @@ do_connects( { PRNetAddr * addr = (PRNetAddr *) a; PRFileDesc * model_sock = (PRFileDesc *) b; - PRFileDesc * ssl_sock = 0; - PRFileDesc * tcp_sock = 0; + PRFileDesc * ssl_sock; + PRFileDesc * tcp_sock; PRStatus prStatus; SECStatus result; int rv = SECSuccess; @@ -748,7 +748,6 @@ retry: goto retry; } errWarn("PR_Connect"); - rv = SECFailure; goto done; } @@ -772,11 +771,7 @@ retry: } done: - if (ssl_sock) { - PR_Close(ssl_sock); - } else if (tcp_sock) { - PR_Close(tcp_sock); - } + PR_Close(ssl_sock); return SECSuccess; } @@ -818,6 +813,7 @@ client_main( PRFileDesc *model_sock = NULL; int i; int rv; + SECStatus secStatus; PRUint32 ipAddress; /* in host byte order */ PRNetAddr addr; @@ -958,22 +954,23 @@ done: int main(int argc, char **argv) { - const char * dir = "."; + char * dir = "."; char * fNickName = NULL; - const char * fileName = NULL; + char * fileName = NULL; char * hostName = NULL; char * nickName = NULL; char * progName = NULL; char * tmp = NULL; - char * passwd = NULL; CERTCertificate * cert [kt_kea_size] = { NULL }; SECKEYPrivateKey * privKey[kt_kea_size] = { NULL }; + int optchar; int connections = 1; - int exitVal; unsigned short port = 443; SECStatus rv; - PLOptState * optstate; - PLOptStatus status; + PRBool useCommandLinePasswd = PR_FALSE; + char * passwd = NULL; + PLOptState *optstate; + PLOptStatus status; /* Call the NSPR initialization routines */ PR_Init( PR_SYSTEM_THREAD, PR_PRIORITY_NORMAL, 1); @@ -1023,6 +1020,7 @@ main(int argc, char **argv) break; case 'w': passwd = optstate->value; + useCommandLinePasswd = PR_TRUE; break; case '\0': hostName = PL_strdup(optstate->value); @@ -1044,11 +1042,11 @@ main(int argc, char **argv) readBigFile(fileName); /* set our password function */ - if ( passwd ) { - PK11_SetPasswordFunc(ownPasswd); - } else { - PK11_SetPasswordFunc(SECU_GetModulePassword); - } + if ( useCommandLinePasswd ) { + PK11_SetPasswordFunc(ownPasswd); + } else { + PK11_SetPasswordFunc(SECU_GetModulePassword); + } /* Call the libsec initialization routines */ rv = NSS_Init(dir); @@ -1059,13 +1057,22 @@ main(int argc, char **argv) if (nickName) { - cert[kt_rsa] = PK11_FindCertFromNickname(nickName, passwd); + if (useCommandLinePasswd) { + cert[kt_rsa] = PK11_FindCertFromNickname(nickName, passwd); + } else { + cert[kt_rsa] = PK11_FindCertFromNickname(nickName, NULL); + } if (cert[kt_rsa] == NULL) { fprintf(stderr, "Can't find certificate %s\n", nickName); exit(1); } - privKey[kt_rsa] = PK11_FindKeyByAnyCert(cert[kt_rsa], passwd); + if (useCommandLinePasswd) { + privKey[kt_rsa] = PK11_FindKeyByAnyCert(cert[kt_rsa], passwd); + } else { + privKey[kt_rsa] = PK11_FindKeyByAnyCert(cert[kt_rsa], NULL); + } + if (privKey[kt_rsa] == NULL) { fprintf(stderr, "Can't find Private Key for cert %s\n", nickName); exit(1); @@ -1073,13 +1080,13 @@ main(int argc, char **argv) } if (fNickName) { - cert[kt_fortezza] = PK11_FindCertFromNickname(fNickName, passwd); + cert[kt_fortezza] = PK11_FindCertFromNickname(fNickName, NULL); if (cert[kt_fortezza] == NULL) { fprintf(stderr, "Can't find certificate %s\n", fNickName); exit(1); } - privKey[kt_fortezza] = PK11_FindKeyByAnyCert(cert[kt_fortezza], passwd); + privKey[kt_fortezza] = PK11_FindKeyByAnyCert(cert[kt_fortezza], NULL); if (privKey[kt_fortezza] == NULL) { fprintf(stderr, "Can't find Private Key for cert %s\n", fNickName); exit(1); @@ -1093,11 +1100,9 @@ main(int argc, char **argv) ssl3_hsh_sid_cache_hits, ssl3_hsh_sid_cache_misses, ssl3_hsh_sid_cache_not_ok); - exitVal = (ssl3_hsh_sid_cache_misses != 1) || - (ssl3_hsh_sid_cache_not_ok != 0); NSS_Shutdown(); PR_Cleanup(); - return exitVal; + return 0; } diff --git a/security/nss/lib/Makefile b/security/nss/lib/Makefile index af84812b9..91ab94618 100644 --- a/security/nss/lib/Makefile +++ b/security/nss/lib/Makefile @@ -80,9 +80,9 @@ export:: $(NSINSTALL) -D crypto; \ for file in $(FILES) ; do \ if test -f $$file; then \ - $(INSTALL) -m 444 $$file crypto; \ + $(NSINSTALL) -m 444 $$file crypto; \ fi; \ done; \ - $(INSTALL) -m 444 crypto/nscertinit.c certdb; \ + $(NSINSTALL) -m 444 crypto/nscertinit.c certdb; \ fi endif diff --git a/security/nss/lib/certdb/secname.c b/security/nss/lib/certdb/secname.c index 8c342ec47..4bef4b6d9 100644 --- a/security/nss/lib/certdb/secname.c +++ b/security/nss/lib/certdb/secname.c @@ -577,10 +577,6 @@ CERT_DecodeAVAValue(SECItem *derAVAValue) convertUCS2toUTF8 = PR_TRUE; theTemplate = SEC_BMPStringTemplate; break; - case SEC_ASN1_UTF8_STRING: - /* No conversion needed ! */ - theTemplate = SEC_UTF8StringTemplate; - break; default: return NULL; } diff --git a/security/nss/lib/fortcrypt/genci.h b/security/nss/lib/fortcrypt/genci.h index f12ec9a77..7868e1853 100644 --- a/security/nss/lib/fortcrypt/genci.h +++ b/security/nss/lib/fortcrypt/genci.h @@ -39,10 +39,10 @@ #define _GENCI_H_ 1 #include "seccomon.h" -#if defined (XP_UNIX) || defined (XP_WIN32) || defined (XP_OS2) +#if defined (XP_UNIX) || defined (XP_WIN32) /* - * On unix, NT, Windows '95, and OS/2 we use full maci + * On unix, NT, and Windows '95 we use full maci */ #include "maci.h" diff --git a/security/nss/lib/pk11wrap/pk11skey.c b/security/nss/lib/pk11wrap/pk11skey.c index 1ad09ad48..12489b889 100644 --- a/security/nss/lib/pk11wrap/pk11skey.c +++ b/security/nss/lib/pk11wrap/pk11skey.c @@ -669,6 +669,7 @@ PK11_ExtractPublicKey(PK11SlotInfo *slot,KeyType keyType,CK_OBJECT_HANDLE id) pk11KeyType = PK11_ReadULongAttribute(slot,id,CKA_KEY_TYPE); if (pk11KeyType == CK_UNAVAILABLE_INFORMATION) { + PORT_SetError( PK11_MapError(crv) ); return NULL; } switch (pk11KeyType) { @@ -2625,7 +2626,7 @@ static PK11SymKey * pk11_HandUnwrap(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, CK_MECHANISM *mech, SECItem *inKey, CK_MECHANISM_TYPE target, CK_ATTRIBUTE *keyTemplate, unsigned int templateCount, - int key_size, void * wincx, CK_RV *crvp) + int key_size, void * wincx) { CK_ULONG len; SECItem outKey; @@ -2645,7 +2646,6 @@ pk11_HandUnwrap(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, outKey.data = (unsigned char*)PORT_Alloc(inKey->len); if (outKey.data == NULL) { PORT_SetError( SEC_ERROR_NO_MEMORY ); - if (crvp) *crvp = CKR_HOST_MEMORY; return NULL; } len = inKey->len; @@ -2659,7 +2659,6 @@ pk11_HandUnwrap(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, pk11_CloseSession(slot,session,owner); PORT_Free(outKey.data); PORT_SetError( PK11_MapError(crv) ); - if (crvp) *crvp =crv; return NULL; } crv = PK11_GETTAB(slot)->C_Decrypt(session,inKey->data,inKey->len, @@ -2669,7 +2668,6 @@ pk11_HandUnwrap(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, if (crv != CKR_OK) { PORT_Free(outKey.data); PORT_SetError( PK11_MapError(crv) ); - if (crvp) *crvp =crv; return NULL; } @@ -2684,7 +2682,6 @@ pk11_HandUnwrap(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, if (slot == NULL) { PORT_SetError( SEC_ERROR_NO_MODULE ); PORT_Free(outKey.data); - if (crvp) *crvp = CKR_DEVICE_ERROR; return NULL; } symKey = pk11_ImportSymKeyWithTempl(slot, target, PK11_OriginUnwrap, @@ -2693,8 +2690,6 @@ pk11_HandUnwrap(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, PK11_FreeSlot(slot); } PORT_Free(outKey.data); - - if (crvp) *crvp = symKey? CKR_OK : CKR_DEVICE_ERROR; return symKey; } @@ -2796,18 +2791,11 @@ pk11_AnyUnwrapKey(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, && !PK11_DoesMechanism(slot,target)) { symKey = pk11_HandUnwrap(slot, wrappingKey, &mechanism, wrappedKey, target, keyTemplate, templateCount, keySize, - wincx, &crv); + wincx); if (symKey) { if (param_free) SECITEM_FreeItem(param_free,PR_TRUE); return symKey; } - /* - * if the RSA OP simply failed, don't try to unwrap again - * with this module. - */ - if (crv == CKR_DEVICE_ERROR){ - return NULL; - } /* fall through, maybe they incorrectly set CKF_DECRYPT */ } @@ -2827,12 +2815,12 @@ pk11_AnyUnwrapKey(PK11SlotInfo *slot, CK_OBJECT_HANDLE wrappingKey, &symKey->objectID); pk11_ExitKeyMonitor(symKey); if (param_free) SECITEM_FreeItem(param_free,PR_TRUE); - if ((crv != CKR_OK) && (crv != CKR_DEVICE_ERROR)) { + if (crv != CKR_OK) { /* try hand Unwrapping */ PK11_FreeSymKey(symKey); symKey = pk11_HandUnwrap(slot, wrappingKey, &mechanism, wrappedKey, target, keyTemplate, templateCount, keySize, - wincx, NULL); + wincx); } return symKey; diff --git a/security/nss/lib/pkix/src/RDNSequence/AppendRelativeDistinguishedName.c b/security/nss/lib/pkix/src/RDNSequence/AppendRelativeDistinguishedName.c deleted file mode 100644 index 4e0d0d018..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/AppendRelativeDistinguishedName.c +++ /dev/null @@ -1,77 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * NSSPKIXRDNSequence_AppendRelativeDistinguishedName - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_INVALID_PKIX_RDN - * NSS_ERROR_NO_MEMORY - * - * Return value: - * PR_SUCCESS upon success - * PR_FAILURE upon failure - */ - -NSS_IMPLEMENT PRStatus -NSSPKIXRDNSequence_AppendRelativeDistinguishedName -( - NSSPKIXRDNSequence *rdnseq, - NSSPKIXRelativeDistinguishedName *rdn -) -{ - nss_ClearErrorStack(); - -#ifdef DEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } - - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_verifyPointer(rdn) ) { - return PR_FAILURE; - } -#endif /* DEBUG */ - - return nssPKIXRDNSequence_AppendRelativeDistinguishedName(rdnseq, rdn); -} diff --git a/security/nss/lib/pkix/src/RDNSequence/GetRelativeDistinguishedNameCount.c b/security/nss/lib/pkix/src/RDNSequence/GetRelativeDistinguishedNameCount.c deleted file mode 100644 index 05b5e89b4..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/GetRelativeDistinguishedNameCount.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * NSSPKIXRDNSequence_GetRelativeDistinguishedNameCount - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_VALUE_OUT_OF_RANGE - * - * Return value: - * Nonnegative integer upon success - * -1 upon failure. - */ - -NSS_IMPLEMENT PRInt32 -NSSPKIXRDNSequence_GetRelativeDistinguishedNameCount -( - NSSPKIXRDNSequence *rdnseq -) -{ - nss_ClearErrorStack(); - -#ifdef DEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return -1; - } -#endif /* DEBUG */ - - return nssPKIXRDNSequence_GetRelativeDistinguishedNameCount(rdnseq); -} diff --git a/security/nss/lib/pkix/src/RDNSequence/InsertRelativeDistinguishedName.c b/security/nss/lib/pkix/src/RDNSequence/InsertRelativeDistinguishedName.c deleted file mode 100644 index 433c2a315..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/InsertRelativeDistinguishedName.c +++ /dev/null @@ -1,79 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * NSSPKIXRDNSequence_InsertRelativeDistinguishedName - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_VALUE_OUT_OF_RANGE - * NSS_ERROR_INVALID_PKIX_RDN - * NSS_ERROR_NO_MEMORY - * - * Return value: - * PR_SUCCESS upon success - * PR_FAILURE upon failure - */ - -NSS_IMPLEMENT PRStatus -NSSPKIXRDNSequence_InsertRelativeDistinguishedName -( - NSSPKIXRDNSequence *rdnseq, - PRInt32 i, - NSSPKIXRelativeDistinguishedName *rdn -) -{ - nss_ClearErrorStack(); - -#ifdef DEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } - - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_verifyPointer(rdn) ) { - return PR_FAILURE; - } -#endif /* DEBUG */ - - return nssPKIXRDNSequence_InsertRelativeDistinguishedName(rdnseq, i, rdn); -} diff --git a/security/nss/lib/pkix/src/RDNSequence/PAppendRelativeDistinguishedName.c b/security/nss/lib/pkix/src/RDNSequence/PAppendRelativeDistinguishedName.c deleted file mode 100644 index 9d1ea4875..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/PAppendRelativeDistinguishedName.c +++ /dev/null @@ -1,105 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRDNSequence_AppendRelativeDistinguishedName - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_INVALID_PKIX_RDN - * NSS_ERROR_NO_MEMORY - * - * Return value: - * PR_SUCCESS upon success - * PR_FAILURE upon failure - */ - -NSS_IMPLEMENT PRStatus -nssPKIXRDNSequence_AppendRelativeDistinguishedName -( - NSSPKIXRDNSequence *rdnseq, - NSSPKIXRelativeDistinguishedName *rdn -) -{ - NSSPKIXRelativeDistinguishedName **na; - NSSPKIXRelativeDistinguishedName *dup; - -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } - - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_verifyPointer(rdn) ) { - return PR_FAILURE; - } -#endif /* NSSDEBUG */ - - if( 0 == rdnseq->count ) { - nss_pkix_RDNSequence_Count(rdnseq); - } - -#ifdef PEDANTIC - if( 0 == rdnseq->count ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return (NSSPKIXRelativeDistinguishedName *)NULL; - } -#endif /* PEDANTIC */ - - na = (NSSPKIXRelativeDistinguishedName **) - nss_ZRealloc(rdnseq->rdns, ((rdnseq->count+2) * - sizeof(NSSPKIXRelativeDistinguishedName *))); - if( (NSSPKIXRelativeDistinguishedName **)NULL == na ) { - return (NSSPKIXRelativeDistinguishedName *)NULL; - } - - rdnseq->rdns = na; - - dup = nssPKIXRelativeDistinguishedName_Duplicate(rdn, rdnseq->arena); - if( (NSSPKIXRelativeDistinguishedName *)NULL == dup ) { - return (NSSPKIXRelativeDistinguishedName *)NULL; - } - - na[ rdnseq->count++ ] = dup; - - return nss_pkix_RDNSequence_Clear(rdnseq); -} diff --git a/security/nss/lib/pkix/src/RDNSequence/PFindRelativeDistinguishedName.c b/security/nss/lib/pkix/src/RDNSequence/PFindRelativeDistinguishedName.c deleted file mode 100644 index 8064b9636..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/PFindRelativeDistinguishedName.c +++ /dev/null @@ -1,90 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRDNSequence_FindRelativeDistinguishedName - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_INVALID_PKIX_RDN - * NSS_ERROR_NOT_FOUND - * NSS_ERROR_VALUE_OUT_OF_RANGE - * - * Return value: - * The index of the specified attribute value upon success - * -1 upon failure. - */ - -NSS_IMPLEMENT PRInt32 -nssPKIXRDNSequence_FindRelativeDistinguishedName -( - NSSPKIXRDNSequence *rdnseq, - NSSPKIXRelativeDistinguishedName *rdn -) -{ - PRUint32 i; - NSSPKIXRelativeDistinguishedName **a; - -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } - - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_verifyPointer(rdn) ) { - return PR_FAILURE; - } -#endif /* NSSDEBUG */ - - for( i = 0, a = rdnseq->rdns; *a; a++, (i > 0x7fffffff) || i++ ) { - if( PR_TRUE == nssPKIXRelativeDistinguishedName_Equal(*a, rdn) ) { - if( i > 0x7fffffff ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return -1; - } - return (PRInt32)i; - } - } - - nss_SetError(NSS_ERROR_NOT_FOUND); - return -1; -} diff --git a/security/nss/lib/pkix/src/RDNSequence/PGetRelativeDistinguishedNameCount.c b/security/nss/lib/pkix/src/RDNSequence/PGetRelativeDistinguishedNameCount.c deleted file mode 100644 index a01077db1..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/PGetRelativeDistinguishedNameCount.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRDNSequence_GetRelativeDistinguishedNameCount - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_VALUE_OUT_OF_RANGE - * - * Return value: - * Nonnegative integer upon success - * -1 upon failure. - */ - -NSS_IMPLEMENT PRInt32 -nssPKIXRDNSequence_GetRelativeDistinguishedNameCount -( - NSSPKIXRDNSequence *rdnseq -) -{ -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return -1; - } -#endif /* NSSDEBUG */ - - if( 0 == rdnseq->count ) { - nss_pkix_RDNSequence_Count(rdnseq); - } - -#ifdef PEDANTIC - if( 0 == rdnseq->count ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return -1; - } -#endif /* PEDANTIC */ - - if( rdnseq->count > 0x7fffffff ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return -1; - } - - return (PRInt32)(rdnseq->count); -} diff --git a/security/nss/lib/pkix/src/RDNSequence/PGetRelativeDistinguishedNames.c b/security/nss/lib/pkix/src/RDNSequence/PGetRelativeDistinguishedNames.c deleted file mode 100644 index 115480dfd..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/PGetRelativeDistinguishedNames.c +++ /dev/null @@ -1,135 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRDNSequence_GetRelativeDistinguishedNames - * - * This routine returns all of the relative distinguished names in the - * specified RDN Sequence. {...} If the array is allocated, or if the - * specified one has extra space, the array will be null-terminated. - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_INVALID_ARENA - * NSS_ERROR_NO_MEMORY - * NSS_ERROR_ARRAY_TOO_SMALL - * - * Return value: - * A valid pointer to an array of NSSPKIXRelativeDistinguishedName - * pointers upon success - * NULL upon failure. - */ - -NSS_IMPLEMENT NSSPKIXRelativeDistinguishedName ** -nssPKIXRDNSequence_GetRelativeDistinguishedNames -( - NSSPKIXRDNSequence *rdnseq, - NSSPKIXRelativeDistinguishedName *rvOpt[], - PRInt32 limit, - NSSArena *arenaOpt -) -{ - NSSPKIXRelativeDistinguishedName **rv = (NSSPKIXRelativeDistinguishedName **)NULL; - PRUint32 i; - -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return (NSSPKIXRelativeDistinguishedName **)NULL; - } - - if( (NSSArena *)NULL != arenaOpt ) { - if( PR_SUCCESS != nssArena_verifyOpt(attribute) ) { - return (NSSPKIXRelativeDistinguishedName **)NULL; - } - } -#endif /* NSSDEBUG */ - - if( 0 == rdnseq->count ) { - nss_pkix_RDNSequence_Count(rdnseq); - } - -#ifdef PEDANTIC - if( 0 == rdnseq->count ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return (NSSPKIXRelativeDistinguishedName **)NULL; - } -#endif /* PEDANTIC */ - - if( (limit < rdnseq->count) && - !((0 == limit) && ((NSSPKIXRelativeDistinguishedName **)NULL == rvOpt)) ) { - nss_SetError(NSS_ERROR_ARRAY_TOO_SMALL); - return (NSSPKIXRelativeDistinguishedName **)NULL; - } - - limit = rdnseq->count; - if( (NSSPKIXRelativeDistinguishedName **)NULL == rvOpt ) { - rv = nss_ZNEWARRAY(arenaOpt, NSSPKIXRelativeDistinguishedName *, limit); - if( (NSSPKIXRelativeDistinguishedName **)NULL == rv ) { - return (NSSPKIXRelativeDistinguishedName **)NULL; - } - } else { - rv = rvOpt; - } - - for( i = 0; i < limit; i++ ) { - rv[i] = nssPKIXRelativedistinguishedName_Duplicate(rdnseq->rdns[i], arenaOpt); - if( (NSSPKIXRelativeDistinguishedName *)NULL == rv[i] ) { - goto loser; - } - } - - return rv; - - loser: - for( i = 0; i < limit; i++ ) { - NSSPKIXRelativeDistinguishedName *x = rv[i]; - if( (NSSPKIXRelativeDistinguishedName *)NULL == x ) { - break; - } - (void)nssPKIXRelativeDistinguishedName_Destroy(x); - } - - if( rv != rvOpt ) { - nss_ZFreeIf(rv); - } - - return (NSSPKIXRelativeDistinguishedName **)NULL; -} diff --git a/security/nss/lib/pkix/src/RDNSequence/PInsertRelativeDistinguishedName.c b/security/nss/lib/pkix/src/RDNSequence/PInsertRelativeDistinguishedName.c deleted file mode 100644 index 213866694..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/PInsertRelativeDistinguishedName.c +++ /dev/null @@ -1,117 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRDNSequence_InsertRelativeDistinguishedName - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_INVALID_PKIX_RDN - * NSS_ERROR_NO_MEMORY - * - * Return value: - * PR_SUCCESS upon success - * PR_FAILURE upon failure - */ - -NSS_IMPLEMENT PRStatus -nssPKIXRDNSequence_InsertRelativeDistinguishedName -( - NSSPKIXRDNSequence *rdnseq, - PRInt32 i, - NSSPKIXRelativeDistinguishedName *rdn -) -{ - NSSPKIXRelativeDistinguishedName **na; - NSSPKIXRelativeDistinguishedName *dup; - PRInt32 c; - -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } - - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_verifyPointer(rdn) ) { - return PR_FAILURE; - } -#endif /* NSSDEBUG */ - - if( 0 == rdnseq->count ) { - nss_pkix_RDNSequence_Count(rdnseq); - } - -#ifdef PEDANTIC - if( 0 == rdnseq->count ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return (NSSPKIXRelativeDistinguishedName *)NULL; - } -#endif /* PEDANTIC */ - - if( (i < 0) || (i >= rdnseq->count) ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return (NSSPKIXRelativeDistinguishedName *)NULL; - } - - na = (NSSPKIXRelativeDistinguishedName **) - nss_ZRealloc(rdnseq->rdns, ((rdnseq->count+2) * - sizeof(NSSPKIXRelativeDistinguishedName *))); - if( (NSSPKIXRelativeDistinguishedName **)NULL == na ) { - return (NSSPKIXRelativeDistinguishedName *)NULL; - } - - rdnseq->rdns = na; - - dup = nssPKIXRelativeDistinguishedName_Duplicate(rdn, rdnseq->arena); - if( (NSSPKIXRelativeDistinguishedName *)NULL == dup ) { - return (NSSPKIXRelativeDistinguishedName *)NULL; - } - - for( c = rdnseq->count; c > i; c-- ) { - na[ c ] = na[ c-1 ]; - } - - na[ i ] = dup; - rdnseq->count++; - - return nss_pkix_RDNSequence_Clear(rdnseq); -} diff --git a/security/nss/lib/pkix/src/RDNSequence/PRemoveRelativeDistinguishedName.c b/security/nss/lib/pkix/src/RDNSequence/PRemoveRelativeDistinguishedName.c deleted file mode 100644 index 447620c77..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/PRemoveRelativeDistinguishedName.c +++ /dev/null @@ -1,104 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRDNSequence_RemoveRelativeDistinguishedName - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_VALUE_OUT_OF_RANGE - * - * Return value: - * PR_SUCCESS upon success - * PR_FAILURE upon failure - */ - -NSS_IMPLEMENT PRStatus -nssPKIXRDNSequence_RemoveRelativeDistinguishedName -( - NSSPKIXRDNSequence *rdnseq, - PRInt32 i -) -{ - NSSPKIXRelativeDistinguishedName **na; - PRInt32 c; - -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } -#endif /* NSSDEBUG */ - - if( 0 == rdnseq->count ) { - nss_pkix_RDNSequence_Count(rdnseq); - } - -#ifdef PEDANTIC - if( 0 == rdnseq->count ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return (NSSPKIXRelativeDistinguishedName *)NULL; - } -#endif /* PEDANTIC */ - - if( (i < 0) || (i >= rdnseq->count) ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return (NSSPKIXRelativeDistinguishedName *)NULL; - } - - nssPKIXRelativeDistinguishedName_Destroy(rdnseq->rdns[i]); - - rdnseq->rdns[i] = rdnseq->rdns[ rdnseq->count ]; - rdnseq->rdns[ rdnseq->count ] = (NSSPKIXRelativeDistinguishedName *)NULL; - rdnseq->count--; - - na = (NSSPKIXRelativeDistinguishedName **) - nss_ZRealloc(rdnseq->rdns, ((rdnseq->count) * - sizeof(NSSPKIXRelativeDistinguishedName *))); - if( (NSSPKIXRelativeDistinguishedName **)NULL == na ) { - return (NSSPKIXRelativeDistinguishedName *)NULL; - } - - rdnseq->rdns = na; - - return nss_pkix_RDNSequence_Clear(rdnseq); -} diff --git a/security/nss/lib/pkix/src/RDNSequence/PSetRelativeDistinguishedNames.c b/security/nss/lib/pkix/src/RDNSequence/PSetRelativeDistinguishedNames.c deleted file mode 100644 index b0320a4b7..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/PSetRelativeDistinguishedNames.c +++ /dev/null @@ -1,153 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRDNSequence_SetRelativeDistinguishedNames - * - * -- fgmr comments -- - * If the array pointer itself is null, the set is considered empty. - * If the count is zero but the pointer nonnull, the array will be - * assumed to be null-terminated. - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_INVALID_PKIX_RDN - * - * Return value: - * PR_SUCCESS upon success - * PR_FAILURE upon failure - */ - -NSS_IMPLEMENT PRStatus -nssPKIXRDNSequence_SetRelativeDistinguishedNames -( - NSSPKIXRDNSequence *rdnseq, - NSSPKIXRelativeDistinguishedName *rdns[], - PRInt32 countOpt -) -{ - NSSPKIXRelativeDistinguishedName **ip; - NSSPKIXRelativeDistinguishedName **newarray; - PRUint32 i; - nssArenaMark *mark; - -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } - - if( (NSSPKIXRelativeDistinguishedName **)NULL == rdns ) { - nss_SetError(NSS_ERROR_INVALID_POINTER); - return PR_FAILURE; - } - - { - PRUint32 i, count; - - if( 0 == countOpt ) { - for( i = 0; i < 0x80000000; i++ ) { - if( (NSSPKIXRelativeDistinguishedName *)NULL == rdns[i] ) { - break; - } - } - -#ifdef PEDANTIC - if( 0x80000000 == i ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return PR_FAILURE; - } -#endif /* PEDANTIC */ - - count = (PRUint32)i; - } else { - if( countOpt < 0 ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return PR_FAILURE; - } - - count = (PRUint32)countOpt; - } - - for( i = 0; i < count; i++ ) { - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_verifyPointer(rdns[i]) ) { - return PR_FAILURE; - } - } - } -#endif /* NSSDEBUG */ - - mark = nssArena_Mark(rdnseq->mark); - if( (nssArenaMark *)NULL == mark ) { - return PR_FAILURE; - } - - newarray = nss_ZNEWARRAY(rdnseq->arena, NSSPKIXRelativeDistinguishedName *, countOpt); - if( (NSSPKIXRelativeDistinguishedName **)NULL == newarray ) { - goto loser; - } - - for( i = 0; i < countOpt; i++ ) { - newarray[i] = nssPKIXRelativeDistinguishedName_Duplicate(rdns[i], rdnseq->arena); - if( (NSSPKIXRelativeDistinguishedName *)NULL == newarray[i] ) { - goto loser; - } - } - - for( i = 0; i < rdnseq->count; i++ ) { - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_Destroy(rdnseq->rdns[i]) ) { - goto loser; - } - } - - nss_ZFreeIf(rdnseq->rdns); - - rdnseq->count = countOpt; - rdnseq->rdns = newarray; - - (void)nss_pkix_RDNSequence_Clear(rdnseq); - - return nssArena_Unmark(rdnseq->arena, mark); - - loser: - (void)nssArena_Release(a->arena, mark); - return PR_FAILURE; -} - diff --git a/security/nss/lib/pkix/src/RDNSequence/RemoveRelativeDistinguishedName.c b/security/nss/lib/pkix/src/RDNSequence/RemoveRelativeDistinguishedName.c deleted file mode 100644 index 141ab7f37..000000000 --- a/security/nss/lib/pkix/src/RDNSequence/RemoveRelativeDistinguishedName.c +++ /dev/null @@ -1,72 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * NSSPKIXRDNSequence_RemoveRelativeDistinguishedName - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN_SEQUENCE - * NSS_ERROR_VALUE_OUT_OF_RANGE - * - * Return value: - * PR_SUCCESS upon success - * PR_FAILURE upon failure - */ - -NSS_IMPLEMENT PRStatus -NSSPKIXRDNSequence_RemoveRelativeDistinguishedName -( - NSSPKIXRDNSequence *rdnseq, - PRInt32 i -) -{ - nss_ClearErrorStack(); - -#ifdef DEBUG - if( PR_SUCCESS != nssPKIXRDNSequence_verifyPointer(rdnseq) ) { - return PR_FAILURE; - } -#endif /* DEBUG */ - - return nssPKIXRDNSequence_RemoveRelativeDistinguishedName(rdnseq, i); -} diff --git a/security/nss/lib/pkix/src/RelativeDistinguishedName/PGetAttributeTypeAndValueCount.c b/security/nss/lib/pkix/src/RelativeDistinguishedName/PGetAttributeTypeAndValueCount.c deleted file mode 100644 index df8e1b48e..000000000 --- a/security/nss/lib/pkix/src/RelativeDistinguishedName/PGetAttributeTypeAndValueCount.c +++ /dev/null @@ -1,85 +0,0 @@ -/* - * The contents of this file are subject to the Mozilla Public - * License Version 1.1 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.mozilla.org/MPL/ - * - * Software distributed under the License is distributed on an "AS - * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - * implied. See the License for the specific language governing - * rights and limitations under the License. - * - * The Original Code is the Netscape security libraries. - * - * The Initial Developer of the Original Code is Netscape - * Communications Corporation. Portions created by Netscape are - * Copyright (C) 1994-2000 Netscape Communications Corporation. All - * Rights Reserved. - * - * Contributor(s): - * - * Alternatively, the contents of this file may be used under the - * terms of the GNU General Public License Version 2 or later (the - * "GPL"), in which case the provisions of the GPL are applicable - * instead of those above. If you wish to allow use of your - * version of this file only under the terms of the GPL and not to - * allow others to use your version of this file under the MPL, - * indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by - * the GPL. If you do not delete the provisions above, a recipient - * may use your version of this file under either the MPL or the - * GPL. - */ - -#ifdef DEBUG -static const char CVS_ID[] = "@(#) $Source$ $Revision$ $Date$ $Name$"; -#endif /* DEBUG */ - -#ifndef PKIX_H -#include "pkix.h" -#endif /* PKIX_H */ - -/* - * nssPKIXRelativeDistinguishedName_GetAttributeTypeAndValueCount - * - * -- fgmr comments -- - * - * The error may be one of the following values: - * NSS_ERROR_INVALID_PKIX_RDN - * NSS_ERROR_VALUE_OUT_OF_RANGE - * - * Return value: - * Nonnegative integer upon success - * -1 upon failure. - */ - -NSS_IMPLEMENT PRInt32 -nssPKIXRelativeDistinguishedName_GetAttributeTypeAndValueCount -( - NSSPKIXRelativeDistinguishedName *rdn -) -{ -#ifdef NSSDEBUG - if( PR_SUCCESS != nssPKIXRelativeDistinguishedName_verifyPointer(rdn) ) { - return -1; - } -#endif /* NSSDEBUG */ - - if( 0 == rdn->count ) { - nss_pkix_RelativeDistinguishedName_Count(rdn); - } - -#ifdef PEDANTIC - if( 0 == rdn->count ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return -1; - } -#endif /* PEDANTIC */ - - if( rdn->count > 0x7fffffff ) { - nss_SetError(NSS_ERROR_VALUE_OUT_OF_RANGE); - return -1; - } - - return (PRInt32)(rdn->count); -} diff --git a/security/nss/lib/ssl/Makefile b/security/nss/lib/ssl/Makefile index a711c3361..421eb355f 100644 --- a/security/nss/lib/ssl/Makefile +++ b/security/nss/lib/ssl/Makefile @@ -60,7 +60,7 @@ ifeq ($(OS_ARCH),WINNT) CSRCS += win32err.c else ifeq ($(OS_ARCH),OS2) -CSRCS += os2_err.c +CSRCS += os2err.c else CSRCS += unix_err.c endif diff --git a/security/nss/tests/common/init.sh b/security/nss/tests/common/init.sh index 3aa839fd7..374d8375f 100644 --- a/security/nss/tests/common/init.sh +++ b/security/nss/tests/common/init.sh @@ -19,10 +19,8 @@ else PATH=${DIST}/${OBJDIR}/bin:${NSPR_PATH}/${OBJDIR}/lib:$PATH fi export PATH -SHLIB_PATH=${NSPR_PATH}/${OBJDIR}/lib -LIBPATH=${NSPR_PATH}/${OBJDIR}/lib LD_LIBRARY_PATH=${NSPR_PATH}/${OBJDIR}/lib -export LD_LIBRARY_PATH SHLIB_PATH LIBPATH +export LD_LIBRARY_PATH echo "LD_LIBRARY_PATH=$LD_LIBRARY_PATH" echo "Creating ${TESTDIR}" if [ ! -d ${TESTDIR} ]; then diff --git a/security/nss/tests/ssl/ssl.sh b/security/nss/tests/ssl/ssl.sh index bdb397139..9b151a097 100755 --- a/security/nss/tests/ssl/ssl.sh +++ b/security/nss/tests/ssl/ssl.sh @@ -210,7 +210,7 @@ do else selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & fi - sleep 20 + sleep 10 tstclnt -p ${PORT} -h ${HOST} -c ${param} ${TLS_FLAG} -f -d . < ${REQUEST_FILE} if [ $? -ne 0 ]; then @@ -248,25 +248,13 @@ do else selfserv -v -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & fi - sleep 20 + sleep 10 pwd echo "tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam}" tstclnt -p ${PORT} -h ${HOST} -f -d ${CLIENTDIR} ${cparam} < ${REQUEST_FILE} - ret=$? - -# -# for some reason the NT client does not return the same error code as Unix -# (sigh). -# - if [ ${OS_ARCH} = "WINNT" ]; then - if [ $value -ne 0 ]; then - if [ $ret -ne 0 ]; then - value=$ret - fi - fi - fi - - if [ $ret -ne $value ]; then + rc=$? +echo "Return code = $rc expected value = ${value} " + if [ $rc -ne ${value} ]; then echo "<TR><TD>"${testname}"</TD><TD bgcolor=red>Failed</TD><TR>" >> ${RESULTS} else echo "<TR><TD>"${testname}"</TD><TD bgcolor=lightGreen>Passed</TD><TR>" >> ${RESULTS} @@ -302,7 +290,7 @@ do else selfserv -p ${PORT} -d ${SERVERDIR} -n ${HOST}.${DOMSUF} -w nss ${sparam} -i ${SERVERPID} & fi - sleep 20 + sleep 10 strsclnt -p ${PORT} ${HOST} -d . -w nss $cparam if [ $? -ne $value ]; then diff --git a/security/nss/tests/ssl/sslauth.txt b/security/nss/tests/ssl/sslauth.txt index e6beda10f..0c1c25fd9 100644 --- a/security/nss/tests/ssl/sslauth.txt +++ b/security/nss/tests/ssl/sslauth.txt @@ -5,17 +5,17 @@ # return server client Test Case name # value params params # ------ ------ ------ --------------- - 0 -r -w_nss TLS Request don't require client auth (client does not provide auth) - 0 -r -n_TestUser_-w_bogus TLS Request don't require client auth (bad password) - 0 -r -n_TestUser_-w_nss TLS Request don't require client auth (client auth) - 0 -r_-r -w_nss TLS Require client auth (client does not provide auth) + -eq -r -w_nss TLS Request don't require client auth (client does not provide auth) + -eq -r -n_TestUser_-w_bogus TLS Request don't require client auth (bad password) + -eq -r -n_TestUser_-w_nss TLS Request don't require client auth (client auth) + -eq -r_-r -w_nss TLS Require client auth (client does not provide auth) # this one should fail - 254 -r_-r -n_TestUser_-w_bogus TLS Require client auth (bad password) - 0 -r_-r -n_TestUser_-w_nss TLS Require client auth (client auth) - 0 -r -T_-w_nss SSL3 Request don't require client auth (client does not provide auth) - 0 -r -T_-n_TestUser_-w_bogus SSL3 Request don't require client auth (bad password) - 0 -r -T_-n_TestUser_-w_nss SSL3 Request don't require client auth (client auth) - 0 -r_-r -T_-w_nss SSL3 Require client auth (client does not provide auth) + -ne -r_-r -n_TestUser_-w_bogus TLS Require client auth (bad password) + -eq -r_-r -n_TestUser_-w_nss TLS Require client auth (client auth) + -eq -r -T_-w_nss SSL3 Request don't require client auth (client does not provide auth) + -eq -r -T_-n_TestUser_-w_bogus SSL3 Request don't require client auth (bad password) + -eq -r -T_-n_TestUser_-w_nss SSL3 Request don't require client auth (client auth) + -eq -r_-r -T_-w_nss SSL3 Require client auth (client does not provide auth) # this one should fail - 254 -r_-r -T_-n_TestUser_-w_bogus SSL3 Require client auth (bad password) - 0 -r_-r -T_-n_TestUser_-w_nss SSL3 Require client auth (client auth) + -ne -r_-r -T_-n_TestUser_-w_bogus SSL3 Require client auth (bad password) + -eq -r_-r -T_-n_TestUser_-w_nss SSL3 Require client auth (client auth) |