openssl 1.1.0 compatibility (Bug 497230)

[deliverable/titan.core.git] / mctr2 / cli / config_read.y

diff --git a/mctr2/cli/config_read.y b/mctr2/cli/config_read.y
index a43e95dad3b74001e17b948f6a213b0e79682edd..4acf98185d63aa7bb2b3016d3f24ee1b3e65a23b 100644 (file)
--- a/mctr2/cli/config_read.y
+++ b/mctr2/cli/config_read.y
@@ -17,6 +17,7 @@
  *   Pandi, Krisztian
  *   Raduly, Csaba
  *   Szabados, Kristof
+ *   Szabo, Bence Janos
  *   Szabo, Janos Zoltan – initial implementation
  *   Szalai, Gabor
  *   Zalanyi, Balazs Andor
@@ -145,6 +146,7 @@ static void yyprint(FILE *file, int type, const YYSTYPE& value);
 %token BeginTestCase
 %token EndTestCase
 
+
 %token <str_val> Identifier
 %token ASN1LowerIdentifier "ASN.1 identifier beginning with a lowercase letter"
 %token MacroRValue
@@ -400,7 +402,7 @@ IntegerValue:
        {
          $$ = BN_new();
     BN_CTX *ctx = BN_CTX_new();
-    BN_CTX_init(ctx);
+    //BN_CTX_init(ctx);
     BN_mul($$, $1, $3, ctx);
     BN_CTX_free(ctx);
     BN_free($1);
@@ -416,7 +418,7 @@ IntegerValue:
       $$ = BN_0;
     } else {
       BN_CTX *ctx = BN_CTX_new();
-      BN_CTX_init(ctx);
+      //BN_CTX_init(ctx);
       BN_div($$, NULL, $1, $3, ctx);
       BN_CTX_free(ctx);
       BN_free(BN_0);
@@ -479,6 +481,7 @@ OctetstringValue:
 
 UniversalCharstringValue:
        Quadruple
+       | USI
 ;
 
 UniversalCharstringFragment:
@@ -491,6 +494,15 @@ Quadruple:
   ParameterExpression ',' ParameterExpression ')'
 ;
 
+USI:
+    CharKeyword '(' UIDlike ')'     
+;
+
+UIDlike:
+    Cstring { Free($1); }
+    | UIDlike ',' Cstring { Free($3); }
+;
+
 StringValue:
        Cstring { $$ = $1; }
        | StringValue '&' Cstring {