Browse Source

fix aesm_service compilation with latest openssl

Signed-off-by: Li, Xun <xun.li@intel.com>
Li, Xun 7 years ago
parent
commit
ce0f128d29
1 changed files with 3 additions and 12 deletions
  1. 3 12
      psw/ae/aesm_service/source/aesm/extension/aesm_encode.cpp

+ 3 - 12
psw/ae/aesm_service/source/aesm/extension/aesm_encode.cpp

@@ -143,17 +143,11 @@ static bool base_64_encode(const uint8_t *in_buf, uint32_t in_size, uint8_t *out
     BIO* bioMem = NULL;
     bool ret = false;
     BIO *bio64 = NULL;
-    BIO_METHOD *bm = BIO_f_base64();
-    if(bm == NULL)
-        goto ret_point;
-    bio64 = BIO_new(bm);
+    bio64 = BIO_new(BIO_f_base64());
     if(bio64 == NULL) 
         goto ret_point;
     BIO_set_flags(bio64, BIO_FLAGS_BASE64_NO_NL);
-    bm = BIO_s_mem();
-    if(bm == NULL)
-        goto ret_point;
-    bioMem = BIO_new(bm);
+    bioMem = BIO_new(BIO_s_mem());
     if(bioMem == NULL)
         goto ret_point;
    (void)BIO_push(bio64, bioMem);
@@ -188,10 +182,7 @@ static bool base_64_decode(const uint8_t *in_buf, uint32_t in_size, uint8_t *out
   bool ret = false;
   int read=0;
   memset(out_buf, 0, *out_size);
-  BIO_METHOD *bm = BIO_f_base64();
-  if(bm == NULL)
-      goto ret_point;
-  b64 = BIO_new(bm);
+  b64 = BIO_new(BIO_f_base64());
   if(b64 == NULL)
       goto ret_point;
   BIO_set_flags(b64, BIO_FLAGS_BASE64_NO_NL);