8529 Extended and regular SADB_ACQUIREs should share address extension code
Portions contributed by: Bayard Bell <buffer.g.overflow@gmail.com>

*** 21,30 ****
--- 21,31 ----
  /*
   * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
   * Use is subject to license terms.
   * Copyright (c) 2012 Nexenta Systems, Inc. All rights reserved.
   * Copyright (c) 2016 by Delphix. All rights reserved.
+  * Copyright (c) 2017, Joyent, Inc.
   */
  
  /*
   * IPsec Security Policy Database.
   *
*** 4686,4697 ****
                  mutex_destroy(&bucket->ipsif_lock);
          }
  }
  
  /*
!  * Update the minimum and maximum supported key sizes for the
!  * specified algorithm. Must be called while holding the algorithms lock.
   */
  void
  ipsec_alg_fix_min_max(ipsec_alginfo_t *alg, ipsec_algtype_t alg_type,
      netstack_t *ns)
  {
--- 4687,4699 ----
                  mutex_destroy(&bucket->ipsif_lock);
          }
  }
  
  /*
!  * Update the minimum and maximum supported key sizes for the specified
!  * algorithm, which is either a member of a netstack alg array or about to be,
!  * and therefore must be called holding ipsec_alg_lock for write.
   */
  void
  ipsec_alg_fix_min_max(ipsec_alginfo_t *alg, ipsec_algtype_t alg_type,
      netstack_t *ns)
  {