[ViewVC] Diff of: cvs/gvpe/src/gvpectrl.C

Comparing gvpe/src/gvpectrl.C (file contents):
Revision 1.16 by root, Thu Jul 18 13:35:16 2013 UTC vs.
Revision 1.18 by root, Wed Jun 29 22:32:48 2016 UTC

       fprintf (stderr, _("generating %d bits key for %s:\n"), bits, node->nodename);
       RSA *rsa = RSA_new ();
       BIGNUM *e = BN_new ();
       BN_set_bit (e, 0); BN_set_bit (e, 16); // 0x10001, 65537
+#if OPENSSL_VERSION_NUMBER < 0x10100000
       BN_GENCB cb;
       BN_GENCB_set (&cb, indicator, 0);
+#else
+      BN_GENCB *cb = BN_GENCB_new ();
+      BN_GENCB_set (cb, indicator, 0);
+#endif
       require (RSA_generate_key_ex (rsa, bits, e, &cb));
       fprintf (stderr, _("Done.\n"));
       printf ("cipher_nid=%d\n", EVP_CIPHER_nid (CIPHER ()));
       printf ("mac_nid=%d\n", EVP_MD_type (MAC_DIGEST ()));
       printf ("auth_nid=%d\n", EVP_MD_type (AUTH_DIGEST ()));
       printf ("sizeof_auth_data=%d\n", sizeof (auth_data));
       printf ("sizeof_rsa_data=%d\n", sizeof (rsa_data));
-      printf ("sizeof_rsa_data_pad=%d\n", sizeof (((rsa_data *)0)->pad));
+      printf ("sizeof_rsa_data_extra_auth=%d\n", sizeof (((rsa_data *)0)->extra_auth));
       printf ("raw_overhead=%d\n", VPE_OVERHEAD);
       printf ("vpn_overhead=%d\n", VPE_OVERHEAD + 6 + 6);
       printf ("udp_overhead=%d\n", UDP_OVERHEAD + VPE_OVERHEAD + 6 + 6);
       exit (EXIT_SUCCESS);
     }

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines